fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1576,26 +1576,18 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             if(Validator.isNotEmpty(nowMonth)){
                 continue;
             }
-            //获取上个账单
-            LambdaQueryWrapper<TopDivideLog> lqw = Wrappers.lambdaQuery();
-            TopDivideLog divideLogLast = iTopDivideLogService.getOne(lqw.eq(TopDivideLog::getTenantId,tenantVo.getTenantId()).eq(TopDivideLog::getDivideType,1).orderByDesc(TopDivideLog::getId).last("limit 1"));
-            divideLog.setDeductMoney(new BigDecimal(0));
-            if(Validator.isNotEmpty(divideLogLast)){
-                //上个月流入未扣金额
-                divideLog.setDeductMoney(divideLogLast.getUnDeductMoney());
-            }
+
             //创建账单
             if(iTopDivideLogService.save(divideLog)){
                 TopDivideOrderQueryBo queryBo1 = new TopDivideOrderQueryBo();
                 queryBo1.setAccomplishStartTime(cal1.getTimeInMillis()/1000);
                 queryBo1.setAccomplishEndTime(cal2.getTimeInMillis()/1000);
-                queryBo1.setDivideModel(1);
                 queryBo1.setTenantId(tenantVo.getTenantId());
                 //订单总待付分成
                 BigDecimal totalPayMoney = new BigDecimal(0);
                 List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthFinishList(queryBo1);
                 for(TopDivideOrderVo vo : list1){
-                    totalPayMoney = totalPayMoney.add(vo.getDivideCompanyMoney());
+                    totalPayMoney = totalPayMoney.add(vo.getBrokerage());
                     TopDivideOrderAddBo addBo = new TopDivideOrderAddBo();
                     addBo.setDivideLogId(divideLog.getId());
                     addBo.setOrderSn(vo.getOrderSn());
@@ -1606,45 +1598,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     divideLog.setCreateNo(vo.getCreateNo());
                 }
                 divideLog.setTotalPayMoney(totalPayMoney);
-                //退款待扣分成
-                queryBo1.setRefundTimeStartTime(cal1.getTimeInMillis()/1000);
-                queryBo1.setRefundTimeEndTime(cal2.getTimeInMillis()/1000);
-                List<TopDivideOrderVo> reList = iTopDivideOrderService.getMonthRefundList(queryBo1);
-                //退款待扣分成
-                BigDecimal deductMoney = new BigDecimal(0);
-                for(TopDivideOrderVo vo : reList){
-                    deductMoney = deductMoney.add(vo.getDivideMoney());
-                    TopDivideOrderAddBo addBo = new TopDivideOrderAddBo();
-                    addBo.setDivideLogId(divideLog.getId());
-                    addBo.setOrderSn(vo.getOrderSn());
-                    addBo.setRefundSn(vo.getRefundSn());
-                    addBo.setOrderType(2);
-                    iTopDivideOrderService.insertByAddBo(addBo);
-                    //佣金机构下的订单，要么都有业务员，要么都没有，有则取第一个
-                    divideLog.setCreateUsername(vo.getCreateUsername());
-                    divideLog.setCreateNo(vo.getCreateNo());
-
-                }
-                //加上上个月流入待扣分成
-                divideLog.setDeductMoney(divideLog.getDeductMoney().add(deductMoney));
-
-                if(divideLog.getTotalPayMoney().compareTo(divideLog.getDeductMoney()) == 0){
-                    divideLog.setRealDeductMoney(divideLog.getDeductMoney());
-                    divideLog.setUnDeductMoney(new BigDecimal(0));
-                    divideLog.setPayMoney(new BigDecimal(0));
-                }
-                else if(divideLog.getTotalPayMoney().compareTo(divideLog.getDeductMoney()) == -1){
-                    //小于
-                    divideLog.setRealDeductMoney(divideLog.getTotalPayMoney());
-                    divideLog.setUnDeductMoney(divideLog.getDeductMoney().subtract(divideLog.getTotalPayMoney()));
-                    divideLog.setPayMoney(new BigDecimal(0));
-                }
-                else if(divideLog.getTotalPayMoney().compareTo(divideLog.getDeductMoney()) == 1){
-                    //大于
-                    divideLog.setRealDeductMoney(divideLog.getDeductMoney());
-                    divideLog.setUnDeductMoney(new BigDecimal(0));
-                    divideLog.setPayMoney(divideLog.getTotalPayMoney().subtract(divideLog.getDeductMoney()));
-                }
+                divideLog.setPayMoney(totalPayMoney);
                 iTopDivideLogService.updateById(divideLog);
 
             }

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

@@ -93,5 +93,7 @@ public class TopDivideOrderVo {
 	/** 业务号 */
 	@ApiModelProperty("业务号")
 	private String createNo;
+	@ApiModelProperty("佣金")
+	private BigDecimal brokerage;
 
 }

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

@@ -84,7 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         v.divide_seller_money,
         v.tenant_id,
         v.create_no,
-        v.create_username
+        v.create_username,
+        v.brokerage
         FROM
         v_top_order v
         WHERE