submit

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

@@ -5451,28 +5451,28 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             return;
         }
         //佣金支付方式
-        String paySn = DateUtils.getTagOrderSn("CP");
-        TopOrderBankPay bankPay = new TopOrderBankPay();
-        bankPay.setOrderSn(order.getOrderSn());
-        bankPay.setPaySn(paySn);
-        bankPay.setTenantId(order.getTenantId().toString());
-        bankPay.setType(4);
-        if (ObjectUtils.isNotNull(order.getBrokerageBankAccount())){
-            bankPay.setToBankAcount(order.getBrokerageBankAccount());
-        }
-        if (ObjectUtils.isNotNull(order.getBrokerageBankName())){
-            bankPay.setToBankName(order.getBrokerageBankName());
-        }
-        if (ObjectUtils.isNotNull(order.getBrokerageBank())){
-            bankPay.setToBankTypeName(order.getBrokerageBank());
-        }
-        bankPay.setMoney(order.getBrokerage());
-        bankPay.setTrainOrgId(order.getTenantId().toString());
-        bankPay.setCreateTime(DateUtils.getNowTime());
-        bankPay.setUpdateTime(DateUtils.getNowTime());
-        bankPay.setStatus(1);
-        bankPay.setPayType(order.getBrokerageType());
-        topOrderBankPayService.save(bankPay);
+//        String paySn = DateUtils.getTagOrderSn("CP");
+//        TopOrderBankPay bankPay = new TopOrderBankPay();
+//        bankPay.setOrderSn(order.getOrderSn());
+//        bankPay.setPaySn(paySn);
+//        bankPay.setTenantId(order.getTenantId().toString());
+//        bankPay.setType(4);
+//        if (ObjectUtils.isNotNull(order.getBrokerageBankAccount())){
+//            bankPay.setToBankAcount(order.getBrokerageBankAccount());
+//        }
+//        if (ObjectUtils.isNotNull(order.getBrokerageBankName())){
+//            bankPay.setToBankName(order.getBrokerageBankName());
+//        }
+//        if (ObjectUtils.isNotNull(order.getBrokerageBank())){
+//            bankPay.setToBankTypeName(order.getBrokerageBank());
+//        }
+//        bankPay.setMoney(order.getBrokerage());
+//        bankPay.setTrainOrgId(order.getTenantId().toString());
+//        bankPay.setCreateTime(DateUtils.getNowTime());
+//        bankPay.setUpdateTime(DateUtils.getNowTime());
+//        bankPay.setStatus(1);
+//        bankPay.setPayType(order.getBrokerageType());
+//        topOrderBankPayService.save(bankPay);
         List<TopOldOrderCheckLog> list = topOldOrderCheckLogService.list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                 .eq(TopOldOrderCheckLog::getOrderSn, order.getOrderSn())
                 .eq(TopOldOrderCheckLog::getCheckFrom, 4)

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -825,7 +825,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN major m ON g.major_id = m.id
-        WHERE 1=1 AND us.exam_status != 0
+        WHERE 1=1 AND us.exam_status != 0 AND us.subscribe_status = 1
         <if test="userId != null and userId !='' ">
             AND us.user_id = #{userId}
         </if>