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.TopOldOrderCommissionExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderSellerExportVo;
@@ -155,6 +156,15 @@ public class TopOldOrderController extends BaseController {
         return util.exportExcel(list, "机构分成列表");
     }
 
+    @ApiOperation("佣金结算列表导出")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/commissionListExport")
+    public AjaxResult<List<TopOldOrderSellerExportVo>> commissionListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCommissionExportVo> list = iTopOldOrderService.commissionListExport(bo);
+        ExcelUtil<TopOldOrderCommissionExportVo> util = new ExcelUtil<TopOldOrderCommissionExportVo>(TopOldOrderCommissionExportVo.class);
+        return util.exportExcel(list, "佣金结算列表");
+    }
+
     @ApiOperation("机构分成列表")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/queryTenantList")

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.TopOldOrderCommissionExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
@@ -95,6 +96,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	List<TopOldOrderSellerExportVo> sellerListExport(TopDivideLogQueryBo bo);
 
+	List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideLogQueryBo bo);
 
 	TopCostTpVo getOrderCost(String orderSn);
 

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

@@ -65,6 +65,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.TopOldOrderCommissionExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderSellerExportVo;
 import com.zhongzheng.modules.top.user.domain.TopSysRole;
@@ -2625,6 +2626,46 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return listExport;
     }
 
+    @Override
+    public List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCommissionExportVo> listExport = new ArrayList<>();
+        List<TopDivideLogVo> list = iTopDivideLogService.getCommissionList(bo);
+        for (TopDivideLogVo logVos : list) {
+            TopOldOrderCommissionExportVo  exportVo = BeanUtil.toBean(logVos, TopOldOrderCommissionExportVo.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.setWaitDeductMoney(exportVo.getDeductMoney());
+            }
+            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());
+            listExport.add(exportVo);
+        }
+        return listExport;
+    }
+
     @Override
     public TopCostTpVo getOrderCost(String orderSn) {
         TopOldOrder order = baseMapper.getOrderBySn(orderSn);

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

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单视图对象")
+public class TopOldOrderCommissionExportVo {
+	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "时间")
+	@ApiModelProperty("时间")
+	private String timeStr;
+
+	@Excel(name = "机构名称")
+	@ApiModelProperty("机构名称")
+	private String tenantName;
+	/** 业务员名称 */
+	@Excel(name = "业务员")
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 业务号 */
+	@Excel(name = "业务号")
+	@ApiModelProperty("业务号")
+	private String createNo;
+
+	@Excel(name = "已付分成(元)")
+	@ApiModelProperty("已付分成(元)")
+	private BigDecimal payMoney;
+	@Excel(name = "已扣分成(元)")
+	@ApiModelProperty("已扣分成(元)")
+	private BigDecimal deductMoney;
+
+
+	@Excel(name = "待付分成(元)")
+	@ApiModelProperty("待付分成(元)")
+	private BigDecimal waitPayMoney;
+	@Excel(name = "待扣分成(元)")
+	@ApiModelProperty("待扣分成(元)")
+	private BigDecimal waitDeductMoney;
+	@Excel(name = "预付时间")
+	@ApiModelProperty("预付时间")
+	private String predictPayTime;
+	@Excel(name = "预付款剩余天数")
+	@ApiModelProperty("预付款剩余天数")
+	private Integer predictPayDay;
+	@Excel(name = "审核状态")
+	@ApiModelProperty("审核状态")
+	private String checkStatus;
+	@Excel(name = "支付时间")
+	@ApiModelProperty("支付时间")
+	private String payTime;
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+
+}

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

@@ -60,7 +60,7 @@ public class TopOldOrderCompanyExportVo {
 	@Excel(name = "支付时间")
 	@ApiModelProperty("支付时间")
 	private String payTime;
-	@Excel(name = "remark")
+	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;