123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseOrderAcceptDetailedDTO.java

@@ -23,5 +23,7 @@ public class BaseOrderAcceptDetailedDTO extends PageParam implements DataInter {
 
     List<Integer> divisionTypes;
 
+    private  Integer acceptId;
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -91,7 +91,10 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             sellingWaterBiz.updWalletByOrderId(orderWaterDTO);
             companyWalletDetailBiz.addOrUpd(orderWaterDTO);
         }else if (status == 3){
-            othderAccept(orderDetailDTO);
+            Integer acceptId = othderAccept(orderDetailDTO);
+            if (acceptId != null && acceptId > 0){
+                companyWalletDetailBiz.saveById(acceptId);
+            }
         }else if (status == 4){
             refundOrderAccept(orderWaterDTO);
             sellingWaterBiz.updWalletByOrderId(orderWaterDTO);
@@ -323,7 +326,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
 
     }
 
-    public  void  othderAccept(OrderDetailDTO orderDetailDTO){
+    public  Integer  othderAccept(OrderDetailDTO orderDetailDTO){
         OrderRentVehicleDetail rentVehicleDetail = orderDetailDTO.getRentVehicleDetail();
         BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
         BeanUtils.copyProperties(orderDetailDTO,acceptDetailed);
@@ -352,6 +355,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             acceptDetailed.setDivisionType(7);
             insertSelective(acceptDetailed);
         }
+        return  acceptDetailed.getId();
     }
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyWalletDetailBiz.java

@@ -57,12 +57,27 @@ public class CompanyWalletDetailBiz extends BaseBiz<CompanyWalletDetailMapper, C
         divisionTypes.add(6);
         divisionTypes.add(7);
         divisionTypes.add(8);
-        BaseOrderAcceptDetailedDTO acceptDetailedDTO = BaseOrderAcceptDetailedDTO
+        BaseOrderAcceptDetailedDTO  acceptDetailedDTO =  BaseOrderAcceptDetailedDTO
                 .builder()
                 .orderNo(orderWaterDTO.getOrderNo())
                 .divisionTypes(divisionTypes)
                 .build();
-        acceptDetailedDTO.setOrderNo(orderWaterDTO.getOrderNo());
+        updByIdOrOrderNo(acceptDetailedDTO);
+    }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void saveById(Integer acceptId){
+        if (acceptId == null || acceptId == 0){
+            throw  new BaseException("分账信息不存在",ResultCode.FAILED_CODE);
+        }
+        BaseOrderAcceptDetailedDTO  acceptDetailedDTO =  BaseOrderAcceptDetailedDTO
+                .builder()
+                .acceptId(acceptId)
+                .build();
+        updByIdOrOrderNo(acceptDetailedDTO);
+    }
+
+    public  void  updByIdOrOrderNo(BaseOrderAcceptDetailedDTO acceptDetailedDTO){
         List<BaseOrderAcceptDetailedVO> list = acceptDetailedBiz.getList(acceptDetailedDTO);
         List<CompanyWalletDetail> walletDetails = new ArrayList<>();
         if (list.size() > 0){
@@ -96,7 +111,6 @@ public class CompanyWalletDetailBiz extends BaseBiz<CompanyWalletDetailMapper, C
                     .collect(Collectors.groupingBy(CompanyWalletDetail::getCompanyId, CollectorsUtil.summingBigDecimal(CompanyWalletDetail::getAmount)));
             amountSum.forEach((k,v) -> updCompanyWallet(k,v));
         }
-
     }
 
 

ace-modules/ace-admin/src/main/resources/mapper/BaseOrderAcceptDetailedMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.BaseOrderAcceptDetailedMapper">
 
 
-    <select id="selectList" parameterType="com.github.wxiaoqi.security.admin.entity.BaseOrderAcceptDetailed" resultType="com.github.wxiaoqi.security.admin.vo.BaseOrderAcceptDetailedVO">
+    <select id="selectList" parameterType="com.github.wxiaoqi.security.admin.dto.BaseOrderAcceptDetailedDTO" resultType="com.github.wxiaoqi.security.admin.vo.BaseOrderAcceptDetailedVO">
         SELECT
         r.*,
         SUM(r.zDivisionAmount)-SUM(r.fDivisionAmount) as divisionAmount
@@ -11,7 +11,13 @@
         (
 
         SELECT mch_id,order_no,order_id,user_id,division_type,entry_type,order_amount,(division_amount-fee) as zDivisionAmount, 0 as fDivisionAmount,fee,status_time FROM base_order_accept_detailed
-        WHERE type=1 AND order_no=#{orderNo} AND `status`=1
+        WHERE type=1  AND `status`=1
+        <if test="orderNo != null and orderNo != ''">
+            AND order_no=#{orderNo}
+        </if>
+        <if test="acceptId != null and acceptId > 0">
+            AND id=#{acceptId}
+        </if>
         <if test="divisionTypes != null and divisionTypes.size() > 0">
             and division_type in
             <foreach collection="divisionTypes" item="divisionType" open="(" separator="," close=")">
@@ -22,7 +28,13 @@
         UNION ALL
 
         SELECT mch_id,order_no,order_id,user_id,division_type,entry_type,order_amount,0 as zDivisionAmount, (division_amount-fee) as fDivisionAmount,fee,status_time FROM base_order_accept_detailed
-        WHERE type=2 AND order_no=#{orderNo} AND `status`=1
+        WHERE type=2  AND `status`=1
+        <if test="orderNo != null and orderNo != ''">
+            AND order_no=#{orderNo}
+        </if>
+        <if test="acceptId != null and acceptId > 0">
+            AND id=#{acceptId}
+        </if>
         <if test="divisionTypes != null and divisionTypes.size() > 0">
             and division_type in
             <foreach collection="divisionTypes" item="divisionType" open="(" separator="," close=")">