fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -147,9 +148,9 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("业务员提成列表导出")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/sellerListExport")
-    public AjaxResult<List<TopOldOrderExportVo>> sellerListExport(TopDivideLogQueryBo bo) {
-        List<TopOldOrderExportVo> list = iTopOldOrderService.tenantListExport(bo);
-        ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
+    public AjaxResult<List<TopOldOrderCompanyExportVo>> sellerListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCompanyExportVo> list = iTopOldOrderService.tenantListExport(bo);
+        ExcelUtil<TopOldOrderCompanyExportVo> util = new ExcelUtil<TopOldOrderCompanyExportVo>(TopOldOrderCompanyExportVo.class);
         return util.exportExcel(list, "机构分成列表");
     }
 
@@ -165,9 +166,9 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("机构分成列表导出")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/tenantListExport")
-    public AjaxResult<List<TopOldOrderExportVo>> tenantListExport(TopDivideLogQueryBo bo) {
-        List<TopOldOrderExportVo> list = iTopOldOrderService.tenantListExport(bo);
-        ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
+    public AjaxResult<List<TopOldOrderCompanyExportVo>> tenantListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCompanyExportVo> list = iTopOldOrderService.tenantListExport(bo);
+        ExcelUtil<TopOldOrderCompanyExportVo> util = new ExcelUtil<TopOldOrderCompanyExportVo>(TopOldOrderCompanyExportVo.class);
         return util.exportExcel(list, "机构分成列表");
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
 import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
 
@@ -89,7 +90,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	TopOrderStatisticsVo statisticsOrder();
 
 
-	List<TopOldOrderExportVo> tenantListExport(TopDivideLogQueryBo bo);
+	List<TopOldOrderCompanyExportVo> tenantListExport(TopDivideLogQueryBo bo);
 
 	List<TopOldOrderExportVo> sellerListExport(TopOldOrderQueryBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -64,6 +64,7 @@ import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 import com.zhongzheng.modules.top.user.service.ITopSysConfigService;
@@ -2565,15 +2566,53 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     }
 
     @Override
-    public List<TopOldOrderExportVo> tenantListExport(TopDivideLogQueryBo bo) {
-        List<TopOldOrderExportVo> listExport = new ArrayList<>();
+    public List<TopOldOrderCompanyExportVo> tenantListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCompanyExportVo> listExport = new ArrayList<>();
         List<TopDivideLogVo> list = iTopDivideLogService.getCompanyList(bo);
-       /* for (TopOldOrderVo vo : list) {
-            if (vo.getCreditStatus() == 0 && Validator.isNotEmpty(vo.getPredictReceiveTime())) {
-                Integer predictDay = DateUtils.dayBetween(vo.getPredictReceiveTime(), DateUtils.getNowTime());
-                vo.setPredictReceiveDay(predictDay);
+        for (TopDivideLogVo logVos : list) {
+            TopOldOrderCompanyExportVo  exportVo = BeanUtil.toBean(logVos, TopOldOrderCompanyExportVo.class);
+            if (Validator.isNotEmpty(logVos.getBillDay())) {
+                Calendar cal1 = new GregorianCalendar();
+                cal1.setTimeInMillis(logVos.getMonthTime()* 1000);
+                cal1.add(Calendar.MONTH, 1);
+                cal1.set(Calendar.DAY_OF_MONTH, logVos.getBillDay());
+                exportVo.setPredictPayTime(DateUtils.timestampToDate(cal1.getTimeInMillis()/1000));
+                Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
+                exportVo.setPredictPayDay(predictDay);
+            }
+            if(logVos.getPayStatus()==1){
+                exportVo.setCheckStatus("已支付");
+                exportVo.setPayTime(DateUtils.timestampToDate(logVos.getPayTime()));
+            }
+            else if(logVos.getPayStatus()==0){
+                exportVo.setCheckStatus("待支付");
+            }
+            else if(logVos.getPayStatus()==2){
+                exportVo.setCheckStatus("待审核");
+            }
+            else if(logVos.getPayStatus()==3){
+                exportVo.setCheckStatus("打款中");
             }
-        }*/
+            else if(logVos.getPayStatus()==4){
+                exportVo.setCheckStatus("打款失败");
+            }
+            exportVo.setTimeStr(logVos.getYear()+"-"+logVos.getMonth());
+            if(Validator.isNotEmpty(logVos.getBillType())){
+                if(logVos.getBillType()==1){
+                    exportVo.setBillType("月度");
+                }
+                else if(logVos.getBillType()==2){
+                    exportVo.setBillType("季度");
+                }
+                else if(logVos.getBillType()==3){
+                    exportVo.setBillType("半年");
+                }
+                else if(logVos.getBillType()==4){
+                    exportVo.setBillType("年度");
+                }
+            }
+            listExport.add(exportVo);
+        }
         return listExport;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderCompanyExportVo.java

@@ -51,7 +51,11 @@ public class TopOldOrderCompanyExportVo {
 	private String predictPayTime;
 	@ApiModelProperty("预付款剩余天数")
 	private Integer predictPayDay;
-
-
+	@ApiModelProperty("审核状态")
+	private String checkStatus;
+	@ApiModelProperty("支付时间")
+	private String payTime;
+	@ApiModelProperty("备注")
+	private String remark;
 
 }