修复核销时centergoods不更新

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -590,7 +590,11 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         xltOrder.setKeHuBianHao(omsOrder.getSupplierCode());
         xltOrder.setShouHuoDiZhi(supplierAddress.getDetail());
         xltOrder.setRenYuanBianHao(omsOrder.getUserCode());
-        xltOrder.setZhuYiShiXian(sysUser.getName()+"("+sysUser.getMobile()+")"+omsOrder.getRemark());
+        String remark = sysUser.getName()+"("+sysUser.getMobile()+")"+omsOrder.getRemark()+supplierAddress.getDetail();
+        if(remark.length()>70){
+            remark = remark.substring(0,70);
+        }
+        xltOrder.setZhuYiShiXian(remark);
         xltOrder.setXieRuShiJian(nowTime);
         xltOrder.setChuLiShiJian(null);
         xltOrder.setRowCreateDate(nowTime);

src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.vtb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.common.model.AmountDTO;
 import com.qs.serve.modules.vtb.entity.VtbFundFlow;
 import com.qs.serve.modules.vtb.entity.dto.VtbFundFlowSumAmtDTO;
 import org.apache.ibatis.annotations.Param;
@@ -20,5 +21,7 @@ public interface VtbFundFlowMapper extends BaseMapper<VtbFundFlow> {
      */
     List<VtbFundFlowSumAmtDTO> listSumAmount(@Param("query") VtbFundFlow flow);
 
+    List<AmountDTO> listActivityCenterGoodsUsed(@Param("ids")List<Long> ids);
+
 }
 

src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java

@@ -6,6 +6,7 @@ import com.qs.serve.modules.vtb.entity.VtbVerification;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -405,20 +405,20 @@ public class VtbVerificationApplication {
             TbsActivityPayCondition payCondition = activityPayConditionService.getById(verification.getPayConditionId());
             payCondition.setFinishedFlag(1);
             activityPayConditionService.updateById(payCondition);
+        }
+        //刷新活动金额
+        TbsActivity activity = tbsActivityService.getById(verification.getActivityId());
+        BigDecimal totalUsed = activity.getUsedAmount().add(totalAmount);
+        TbsActivity activity4Upd = new TbsActivity();
+        activity4Upd.setId(activity.getId());
+        activity4Upd.setUsedAmount(totalUsed);
+        if(totalUsed.compareTo(activity.getTotalAmount())>=0){
+            activity4Upd.setActivityState(TbsActivityState.STATE_1_Finished);
         }else {
-            //刷新活动金额
+            activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo);
-            TbsActivity activity = tbsActivityService.getById(verification.getActivityId());
-            BigDecimal totalUsed = activity.getUsedAmount().add(totalAmount);
-            TbsActivity activity4Upd = new TbsActivity();
-            activity4Upd.setId(activity.getId());
-            activity4Upd.setUsedAmount(totalUsed);
-            if(totalUsed.compareTo(activity.getTotalAmount())>=0){
-                activity4Upd.setActivityState(TbsActivityState.STATE_1_Finished);
-            }else {
-                activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo);
-            }
-            tbsActivityService.updateById(activity4Upd);
         }
+        tbsActivityService.updateById(activity4Upd);
+
         //更新金额，已完成
         VtbVerification vtbVer = new VtbVerification();
         vtbVer.setId(verification.getId());

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -7,6 +7,7 @@ import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.manager.AsyncFactory;
 import com.qs.serve.common.framework.manager.AsyncManager;
+import com.qs.serve.common.model.AmountDTO;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
@@ -45,6 +46,7 @@ import com.qs.serve.modules.vtb.common.VtbVerificationState;
 import com.qs.serve.modules.vtb.entity.*;
 import com.qs.serve.modules.vtb.entity.bo.*;
 import com.qs.serve.modules.seeyon.entity.XltApticlaim;
+import com.qs.serve.modules.vtb.mapper.VtbFundFlowMapper;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationYardItemMapper;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationYardMapper;
@@ -100,6 +102,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final VtbVerificationChannelPointService verificationChannelPointService;
     private final VtbVerificationSubjectService verificationSubjectService;
     private final VtbFundFlowService fundFlowService;
+    private final VtbFundFlowMapper vtbFundFlowMapper;
     private final VtbVerificationYardMapper verificationYardMapper;
     private final VtbVerificationYardItemMapper verificationYardItemMapper;
 
@@ -1314,6 +1317,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                                 List<TbsActivityCenterGoods> activityCenterGoodsOfSubject,
                                 BigDecimal usedAmount) {
         List<VtbFundFlow> addFundFlowListOfSubject = new ArrayList<>();
+        List<Long> centerGoodsIds = activityCenterGoodsOfSubject.stream().map(TbsActivityCenterGoods::getId).collect(Collectors.toList());
+        List<AmountDTO> lastUsedList = vtbFundFlowMapper.listActivityCenterGoodsUsed(centerGoodsIds);
         //统计不匹配金额
         for (int i = 0; i < activityCenterGoodsOfSubject.size(); i++) {
             TbsActivityCenterGoods centerGoods = activityCenterGoodsOfSubject.get(i);
@@ -1331,6 +1336,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                         .divide(new BigDecimal("100"), RoundingMode.HALF_DOWN)
                         .setScale(2, RoundingMode.DOWN);;
             }
+            BigDecimal lastUsed = BigDecimal.ZERO;
+            for (AmountDTO amountDTO : lastUsedList) {
+                if(amountDTO.getId().equals(centerGoods.getId()+"")){
+                    lastUsed = amountDTO.getAmount();
+                    break;
+                }
+            }
+            centerGoods.setUsedAmount(currentTimeAmount.add(lastUsed));
+            activityCenterGoodsService.updateById(centerGoods);
             VtbFundFlow fundFlow = CopierUtil.copy(centerGoods,new VtbFundFlow());
             fundFlow.setId(null);
             fundFlow.setUsedAmount(currentTimeAmount);

src/main/resources/mapper/vtb/VtbFundFlowMapper.xml

@@ -85,6 +85,19 @@
             vtb_fund_flow.activity_id
     </select>
 
+    <select id="listActivityCenterGoodsUsed" resultType="com.qs.serve.common.model.AmountDTO">
+        select sum(vtb_fund_flow.used_amount) as amount,
+               center_good_item_id as id
+        from vtb_fund_flow
+        where center_good_item_id in
+        <foreach collection="ids" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        and del_flag = 0
+        and fund_type = 'verification'
+        GROUP BY center_good_item_id
+    </select>
+
 
 </mapper>