From 4733fb59e728ae69f0fcd333394420ba26e0cb67 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 21 Dec 2023 07:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B8=E9=94=80=E6=97=B6ce?= =?UTF-8?q?ntergoods=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/service/impl/OmsOrderServiceImpl.java | 6 ++++- .../modules/vtb/mapper/VtbFundFlowMapper.java | 3 +++ .../vtb/mapper/VtbVerificationMapper.java | 1 + .../service/VtbVerificationApplication.java | 24 +++++++++---------- .../impl/VtbVerificationServiceImpl.java | 14 +++++++++++ .../mapper/vtb/VtbFundFlowMapper.xml | 13 ++++++++++ 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index 77819f5c..98b76e10 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -590,7 +590,11 @@ public class OmsOrderServiceImpl extends ServiceImpl 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); diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java index b95210d9..43f0717d 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java +++ b/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 { */ List listSumAmount(@Param("query") VtbFundFlow flow); + List listActivityCenterGoodsUsed(@Param("ids")List ids); + } diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java index 43e13cc3..fed6955e 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java +++ b/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; /** diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index fa409e23..6f3cedee 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/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 { - //刷新活动金额 - 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); + activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo); } + tbsActivityService.updateById(activity4Upd); + //更新金额，已完成 VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 8591c39c..133f3396 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/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 activityCenterGoodsOfSubject, BigDecimal usedAmount) { List addFundFlowListOfSubject = new ArrayList<>(); + List centerGoodsIds = activityCenterGoodsOfSubject.stream().map(TbsActivityCenterGoods::getId).collect(Collectors.toList()); + List 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 + +