fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopDivideLogController.java

@@ -87,13 +87,21 @@ public class TopDivideLogController extends BaseController {
 
     @ApiOperation("查询佣金列表")
     @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/commissionList")
-    public TableDataInfo<TopDivideLogVo> getCommissionList(TopDivideLogQueryBo bo) {
+    @PostMapping("/commissionList")
+    public TableDataInfo<TopDivideOrderVo> getCommissionList(@RequestBody TopDivideOrderQueryBo bo) {
         startPage();
-        List<TopDivideLogVo> list = iTopDivideLogService.getCommissionList(bo);
+        List<TopDivideOrderVo> list = iTopDivideLogService.getCommissionList(bo);
         return getDataTable(list);
     }
 
+    @ApiOperation("查询佣金打印")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @PostMapping("/commissionPrint")
+    public AjaxResult<TopDivideOrderVo> getCommissionPrint(@RequestBody TopDivideOrderQueryBo bo) {
+        List<TopDivideOrderVo> list = iTopDivideLogService.getCommissionList(bo);
+        return AjaxResult.success(list.get(0));
+    }
+
     @ApiOperation("通过坏账配置详情")
     @GetMapping(value = "/configKey/badBill")
     public AjaxResult getBadBill()

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

@@ -9,6 +9,7 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.top.financial.bo.OrderRefundPayBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
 import com.zhongzheng.modules.top.financial.vo.OrderRefundPayDetailVo;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
@@ -166,7 +167,7 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("佣金结算列表导出")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/commissionListExport")
-    public AjaxResult<List<TopOldOrderSellerExportVo>> commissionListExport(TopDivideLogQueryBo bo) {
+    public AjaxResult<List<TopOldOrderSellerExportVo>> commissionListExport(TopDivideOrderQueryBo bo) {
         List<TopOldOrderCommissionExportVo> list = iTopOldOrderService.commissionListExport(bo);
         ExcelUtil<TopOldOrderCommissionExportVo> util = new ExcelUtil<TopOldOrderCommissionExportVo>(TopOldOrderCommissionExportVo.class);
         return util.exportExcel(list, "佣金结算列表");
@@ -252,8 +253,8 @@ public class TopOldOrderController extends BaseController {
     }
 
     @ApiOperation("订单应收应付统计")
-    @GetMapping("/countOrderNum")
-    public AjaxResult<Map<String, Object>> countOrderNum(TopOldOrderQueryBo bo) {
+    @PostMapping("/countOrderNum")
+    public AjaxResult<Map<String, Object>> countOrderNum(@RequestBody TopOldOrderQueryBo bo) {
         return AjaxResult.success(iTopOldOrderService.countOrderNum(bo));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -142,4 +142,7 @@ public class ClassPeriodUserVo {
 	private Long classStartTime;
 
 	private Long classEndTime;
+
+	@ApiModelProperty("官方班级名称")
+	private String officialName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderQueryBo.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -61,8 +62,8 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 	private BigDecimal payMoney;
 	/** 审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付） */
 	@Excel(name = "审核状态：0待审核，1已通过，-1未通过，" , readConverterExp = "2=待支付，3已支付")
-	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
-	private Integer checkStatus;
+	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）4审核中")
+	private List<Integer> checkStatus;
 
 	@ApiModelProperty("完单开始时间")
 	private Long accomplishStartTime;
@@ -102,4 +103,17 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("结束金额")
 	private BigDecimal endPrice;
+
+	@ApiModelProperty("非支付状态")
+	private Integer notPayStatus;
+
+	@ApiModelProperty("角色ID列表")
+	private List<Long> roleIds;
+
+	@ApiModelProperty("机构ID")
+	private List<String> tenantIds;
+
+	@ApiModelProperty("重写审核状态：1待审核 2审核中")
+	private Integer reCheckStatus;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideLogService.java

@@ -6,8 +6,10 @@ import com.zhongzheng.modules.system.bo.SysTenantBadBillConfigBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogAddBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
 import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
 
 import java.util.Collection;
@@ -67,7 +69,7 @@ public interface ITopDivideLogService extends IService<TopDivideLog> {
 
 	List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo);
 
-	List<TopDivideLogVo> getCommissionList(TopDivideLogQueryBo bo);
+	List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo);
 
 	String getBadBillConfig();
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideLogServiceImpl.java

@@ -14,11 +14,14 @@ import com.zhongzheng.modules.system.vo.SysTenantVo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogAddBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
 import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
 import com.zhongzheng.modules.top.financial.mapper.TopDivideLogMapper;
 import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
 import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
+import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
@@ -52,6 +55,9 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     @Autowired
     private ITopOrderBankPayService iTopOrderBankPayService;
 
+    @Autowired
+    private ITopDivideOrderService iTopDivideOrderService;
+
     @Override
     public TopDivideLogVo queryById(Long id){
         TopDivideLog db = this.baseMapper.selectById(id);
@@ -324,19 +330,23 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     }
 
     @Override
-    public List<TopDivideLogVo> getCommissionList(TopDivideLogQueryBo bo) {
-        List<TopDivideLogVo> list = baseMapper.getCommissionList(bo);
-        for(TopDivideLogVo logVos : list){
-            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());
-                logVos.setPredictPayTime(cal1.getTimeInMillis()/1000);
-                Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
-                logVos.setPredictPayDay(predictDay);
+    public List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo) {
+        if(Validator.isNotEmpty(bo.getCheckStatus())){
+            List<Integer> payStatus = new ArrayList<>();
+            for(Integer status : bo.getCheckStatus()){
+                if(status==0){
+                    bo.setReCheckStatus(1);
+                }
+                else if(status==4){
+                    bo.setReCheckStatus(2);
+                }
+                else{
+                    payStatus.add(status);
+                }
             }
+            bo.setCheckStatus(payStatus);
         }
+        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthCreditList(bo);
         return list;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -110,6 +110,28 @@ public class TopDivideOrderVo {
 	private Long orderCreateTime;
 	@ApiModelProperty("业务层次列表")
 	private List<String> businessList;
+	@ApiModelProperty("税率")
+	private BigDecimal pretax;
+	@ApiModelProperty("支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
+	private Integer payType;
+	private Long createTime;
+	@ApiModelProperty("下单企业")
+	@Excel(name = "客户名称")
+	private String purchaseOrg;
+	/** 银行账号 */
+	@Excel(name = "银行账号")
+	@ApiModelProperty("银行账号")
+	private String toBankAcount;
+	/** 账号名称 */
+	@Excel(name = "账号名称")
+	@ApiModelProperty("账号名称")
+	private String toBankName;
+	/** 银行名称 */
+	@Excel(name = "银行名称")
+	@ApiModelProperty("银行名称")
+	private String toBankTypeName;
+	@ApiModelProperty("支付时间")
+	private Long payTime;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -52,7 +52,7 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	private String orderSn;
 	/** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
 	@ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
-	private Integer checkStatus;
+	private List<Integer> checkStatus;
 	/** 退款状态：0待审核，1未通过，2未退款，3已完成 */
 	@ApiModelProperty("退款状态：0待审核，1正常，2未退款，3已完成，4未通过")
 	private Integer refundStatus;
@@ -146,4 +146,5 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	@ApiModelProperty("运营类型：1代运营 2独立运营")
 	private Integer operationType;
 
+
 }

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

@@ -95,7 +95,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	List<TopOldOrderSellerExportVo> sellerListExport(TopDivideLogQueryBo bo);
 
-	List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideLogQueryBo bo);
+	List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideOrderQueryBo bo);
 
 	TopCostTpVo getOrderCost(String orderSn);
 

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

@@ -2974,12 +2974,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     }
 
     @Override
-    public List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideLogQueryBo bo) {
+    public List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideOrderQueryBo bo) {
         List<TopOldOrderCommissionExportVo> listExport = new ArrayList<>();
-        List<TopDivideLogVo> list = iTopDivideLogService.getCommissionList(bo);
-        for (TopDivideLogVo logVos : list) {
+        List<TopDivideOrderVo> list = iTopDivideLogService.getCommissionList(bo);
+        for (TopDivideOrderVo logVos : list) {
             TopOldOrderCommissionExportVo exportVo = BeanUtil.toBean(logVos, TopOldOrderCommissionExportVo.class);
-            if (Validator.isNotEmpty(logVos.getBillDay())) {
+/*            if (Validator.isNotEmpty(logVos.getBillDay())) {
                 Calendar cal1 = new GregorianCalendar();
                 cal1.setTimeInMillis(logVos.getMonthTime() * 1000);
                 cal1.add(Calendar.MONTH, 1);
@@ -3002,8 +3002,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 exportVo.setCheckStatus("打款中");
             } else if (logVos.getPayStatus() == 4) {
                 exportVo.setCheckStatus("打款失败");
-            }
-            exportVo.setTimeStr(logVos.getYear() + "-" + logVos.getMonth());
+            }*/
+        //    exportVo.setTimeStr(logVos.getYear() + "-" + logVos.getMonth());
             listExport.add(exportVo);
         }
         return listExport;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBankPayAddBo.java

@@ -69,4 +69,7 @@ public class TopOrderBankPayAddBo {
 
     @ApiModelProperty("分成月份记录ID")
     private Long divideLogId;
+    /** 支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账 */
+    @ApiModelProperty("支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
+    private Integer payType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBankPayEditBo.java

@@ -66,5 +66,8 @@ public class TopOrderBankPayEditBo {
     /** 支付结果 1成功 0失败 */
     @ApiModelProperty("支付结果 1回调成功 0支付中未回调 -1回调失败")
     private Integer resultStatus;
+    /** 支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账 */
+    @ApiModelProperty("支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
+    private Integer payType;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOrderBankPay.java

@@ -57,4 +57,6 @@ private static final long serialVersionUID=1L;
     private String tenantId;
     private String payUsername;
     private Long divideLogId;
+    /** 支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账 */
+    private Integer payType;
 }

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

@@ -65,4 +65,8 @@ public class TopOrderBankPayVo {
 	@Excel(name = "支付结果 1回调成功 0支付中未回调 -1回调失败")
 	@ApiModelProperty("支付结果 1回调成功 0支付中未回调 -1回调失败")
 	private Integer resultStatus;
+	/** 支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账 */
+	@Excel(name = "支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
+	@ApiModelProperty("支付平台 1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
+	private Integer payType;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -812,6 +812,7 @@
         g.goods_id,
         g.goods_name,
         cg.class_name,
+        cg.official_name,
         cg.class_start_time,
         cg.class_end_time,
         g.class_hours,

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -176,10 +176,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="payStatus != null">
             AND dl.pay_status = #{payStatus}
         </if>
-        <if test="billType != null and billType != ''">
+        <if test="billType != null and billType.size()!=0">
             AND st.bill_type = #{billType}
         </if>
-        <if test="monthTime != null and monthTime != ''">
+        <if test="monthTime != null and monthTime.size()!=0">
             AND dl.month_time in
             <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
@@ -207,15 +207,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <if test="createNo != null ">
-            AND dl.create_no = #{createNo}
+            AND (dl.create_no = #{createNo} or dl.create_username like concat('%', #{createNo}, '%'))
         </if>
-        <if test="monthTime != null and monthTime != ''">
+        <if test="monthTime != null and monthTime.size()!=0">
             AND dl.month_time in
             <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="tenantIds != null and tenantIds != ''">
+        <if test="tenantIds != null and tenantIds.size()!=0">
             AND dl.tenant_id in
             <foreach collection="tenantIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
@@ -235,7 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcl.check_from = 3
             AND bcl.check_status = 0
             AND bcl.check_sign = 1
-            <if test="roleIds != null and roleIds != ''">
+            <if test="roleIds != null and roleIds.size()!=0">
                 AND bcl.role_id in
                 <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
@@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcl.check_from = 3
             AND bcl.check_status = 0
             AND bcl.check_sign = 1
-            <if test="roleIds != null and roleIds != ''">
+            <if test="roleIds != null and roleIds.size()!=0">
                 AND bcl.role_id not in
                 <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
                     #{item}

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -31,7 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.order_from,
             oo.create_time as order_create_time,
             r.role_name,
-            r.role_id
+            r.role_id,
+            oo.create_username,
+            oo.create_no
         FROM
             top_divide_order tdo
                 LEFT JOIN top_divide_log dl ON tdo.divide_log_id = dl.id
@@ -242,14 +244,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMonthCreditList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
         SELECT
         v.order_sn,
+        v.create_time,
+        v.purchase_org,
         v.divide_company_money,
         v.divide_seller_money,
         v.tenant_id,
         v.create_no,
         v.create_username,
-        v.brokerage
+        v.brokerage,
+        v.order_price,
+        st.tenant_name,
+        v.pretax_brokerage,
+        v.pay_type,
+        r.role_name,
+        r.role_id,
+        cl.check_status,
+        v.pretax,
+        bp.pay_type,
+        bp.to_bank_acount,
+        bp.to_bank_name,
+        bp.to_bank_type_name,
+        bp.create_time as pay_time
         FROM
         top_old_order v
+        LEFT JOIN sys_tenant st ON v.tenant_id = st.tenant_id
+        LEFT JOIN
+        top_old_order_check_log cl ON cl.check_from = 4 AND  cl.check_sign = 1  AND  v.order_sn = cl.order_sn
+        LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
+        LEFT JOIN top_order_bank_pay bp ON bp.type = 3 AND bp.order_sn = v.order_sn AND bp.result_status = 1
         WHERE
         1 = 1
         <if test="accomplishStartTime != null and accomplishStartTime != ''">
@@ -259,8 +281,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND v.tenant_id = #{tenantId}
         </if>
         <if test="createNo != null and createNo != ''">
-            AND v.create_no = #{createNo}
+            AND (v.create_no = #{createNo} or v.create_username like concat('%', #{createNo}, '%'))
         </if>
+        <if test="orderSn != null and orderSn != ''">
+            AND v.order_no = #{orderSn}
+        </if>
+        AND v.credit_time > 0
+
     </select>
 
     <select id="getMonthRefundList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">