fix

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

@@ -60,6 +60,8 @@ import com.zhongzheng.modules.top.goods.service.*;
 import com.zhongzheng.modules.top.goods.vo.*;
 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.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
@@ -170,6 +172,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private ITopOldSellerDiscountService topOldSellerDiscountService;
 
+    @Autowired
+    private ITopOrderBankPayService iTopOrderBankPayService;
+
+
+
     @Value("${oldOrder.studyRecord}")
     private String ORDER_STUDY;
 
@@ -1105,6 +1112,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         for (TopOldOrderCheckLogVo vo : checkLogVoList) {
             if (vo.getCheckSign() == 1) {
                 orderVo.setCheckType(vo.getType());
+                orderVo.setCheckStatus(vo.getCheckStatus());
             }
         }
         orderVo.setCheckLogVos(checkLogVoList);
@@ -1980,8 +1988,31 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean payToCompanyCallBack(PayOrderCallBackBo bo) {
-        System.out.println(bo);
+        String paySn = bo.getMainUniqueId();
+        TopOrderBankPay bankPay = iTopOrderBankPayService.getOne(new LambdaQueryWrapper<TopOrderBankPay>()
+                .eq(TopOrderBankPay::getPaySn, paySn).last("limit 1"));
+        if(Validator.isEmpty(bankPay)){
+            throw new CustomException("支付单号错误");
+        }
+        TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>()
+                .eq(TopOldOrder::getOrderSn, bankPay.getOrderSn()).last("limit 1"));
+        if(Validator.isEmpty(order)||order.getDivideStatus()!=6){
+           throw new CustomException("订单非法操作");
+        }
+        if(bo.getStatus()==1){
+            bankPay.setResultStatus(1);
+            order.setDivideStatus(7);
+        }
+        if(bo.getStatus()==0){
+            bankPay.setResultStatus(-1);
+            order.setDivideStatus(8);
+        }
+        bankPay.setUpdateTime(DateUtils.getNowTime());
+        iTopOrderBankPayService.updateById(bankPay);
+        order.setUpdateTime(DateUtils.getNowTime());
+        updateById(order);
         return true;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -242,4 +242,6 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("流程类型：1审核，2支付")
 	private Integer checkType;
+	@ApiModelProperty("分成审核状态：0待审核，1已通过，-1未通过，2待支付，3已支付")
+	private Integer divideCheckStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderBankPayServiceImpl.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -139,6 +140,7 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean payToCompany(TopOrderBankPayAddBo bo) {
         if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())||Validator.isEmpty(bo.getDivideModel())){
             throw new CustomException("参数错误");
@@ -199,6 +201,7 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
         if(bo.getDivideModel()==2){
             money =order.getDivideSellerMoney();
         }
+        add.setMoney(money);
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();
         String sign = ToolsUtils.EncoderByMd5(paySn+nowTime.toString()+"pubilc2022");

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

@@ -232,7 +232,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         too.*,
         st.tenant_name,
-        r.role_name
+        r.role_name,
+        cl.check_status as divide_check_status
         FROM
         v_top_order too
         LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
@@ -269,7 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         too.*,
         st.tenant_name,
-        r.role_name
+        r.role_name,
+        cl.check_status as divide_check_status
         FROM
         top_old_order too
         LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id