From a2bd522e7e66fc04bd61238d74ec68d6042b5846 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 25 Apr 2024 17:30:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=8C=96bir=E5=AF=BC=E8=87=B4=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/BirHttpUtil.java | 11 ++++ .../bir/controller/BirRoiRateController.java | 55 +++++++------------ .../impl/SeeYonRequestServiceImpl.java | 1 + .../TbsCostApplyOperationServiceImpl.java | 23 ++++---- .../impl/VtbVerificationServiceImpl.java | 15 ++--- 5 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java index 7f80c1e6..285fbd42 100644 --- a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.model.consts.GySysConst; import com.qs.serve.common.model.dto.R; +import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.apache.http.ParseException; @@ -94,4 +95,14 @@ public class BirHttpUtil { return r; } + public static TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName, String supplierCode){ + Map map = new HashMap<>(); + map.put("centerType",centerType); + map.put("centerId",centerId); + map.put("centerName",centerName); + map.put("supplierCode",supplierCode); + R result = get("/bir/roiRate/getCostCenter",map); + return JsonUtil.jsonToPojo(result.getData().toString(),TbsCostSubItem.CostCenterTranStr.class); + } + } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 8524a6a8..03223a4e 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -17,8 +17,10 @@ import com.qs.serve.modules.sys.entity.SysDictData; import com.qs.serve.modules.sys.service.SysDictDataService; import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.entity.TbsActivity; +import com.qs.serve.modules.tbs.entity.TbsActivityCenter; import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; +import com.qs.serve.modules.tbs.mapper.TbsActivityCenterMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; import com.qs.serve.modules.tbs.service.TbsBudgetService; import com.qs.serve.modules.tbs.service.TbsCostApplyService; @@ -54,47 +56,32 @@ public class BirRoiRateController { private SysDictDataService sysDictDataService; private TbsCostApplyService costApplyService; private TbsActivityMapper tbsActivityMapper; + private TbsActivityCenterMapper tbsActivityCenterMapper; private BirBaseActivityService birBaseActivityService; - -// /** -// * 台账数据集 -// * @return -// */ -// @GetMapping("/standingBook") -// public R> getStandingBook(String type){ -// -// List list = new ArrayList<>(); -// BirCenterCostRateItem rateItem = new BirCenterCostRateItem(); -// rateItem.setTargetDispatchAmt(BigDecimal.ZERO); -// rateItem.setBudgetAmt(new BigDecimal("123456")); -// rateItem.setTargetRoiRate(new BigDecimal("123456")); -// rateItem.setRealDispatchAmt(new BigDecimal("123456")); -// rateItem.setCostAmt(new BigDecimal("123456")); -// rateItem.setRealRoiRate(new BigDecimal("123456")); -// rateItem.setCostPassAmt(new BigDecimal("123456")); -// rateItem.setCostApplyingAmt(new BigDecimal("123456")); -// rateItem.setCheckedAmt(new BigDecimal("123456")); -// rateItem.setCheckingAmt(new BigDecimal("123456")); -// rateItem.setNoCheckAmt(new BigDecimal("123456")); -// rateItem.setReleaseAmt(new BigDecimal("123456")); -// rateItem.setFrozenAmt(new BigDecimal("123456")); -// list.add(rateItem); -// return R.ok(); -// } - - /** - * + * 测试 + * @param id * @return */ - @GetMapping("/test22") - public R test22(){ - //修复activity和centerGoods不匹配 - birBaseActivityService.compareAmtToUpdateActivityAmt(); - return R.ok(); + //@GetMapping("/testCostCenter") + public R buildCostCenter(String id){ + TbsActivityCenter tbsActivityCenter = tbsActivityCenterMapper.selectById(id); + TbsActivity activity = tbsActivityMapper.selectById(tbsActivityCenter.getActivityId()); + return R.ok(birCenterRateService.buildCostCenter(tbsActivityCenter.getCenterType(), + tbsActivityCenter.getCenterId(), + tbsActivityCenter.getCenterName(), + activity.getSupplierCode())); + } + + @GetMapping("/getCostCenter") + public R buildCostCenter(String centerType, String centerId, String centerName,String supplierCode){ + return R.ok(birCenterRateService.buildCostCenter(centerType, centerId, centerName, supplierCode)); } + + + /** * 台账 * @return diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java index b4cab5c4..d472efc4 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java @@ -98,6 +98,7 @@ public class SeeYonRequestServiceImpl implements SeeYonRequestService { @Override public R baseCreateProcess(BaseCreateProcessBo createProcessBo) { String title = "【创建流程】"; + log.warn("创建审批{}流程{}",createProcessBo.getTemplateCode(),JsonUtil.objectToJson(createProcessBo)); R result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_PROCESS_CREATE,createProcessBo,title); return result; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index e41cc67c..c738066b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -632,18 +632,18 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService } if(goodsRateTotal.compareTo(n100)!=0){ log.error("活动ID:{} 的商品比例错误：{} ,即将重新分配活动成本中心比例",subject.getActivityId(),goodsRateTotal); - } - BigDecimal centerRateSurplus = n100; - BigDecimal itemRate = n100.divide(new BigDecimal(activityCenterGoodsTmpList.size()),1,RoundingMode.DOWN); - for (int i = 0; i < activityCenterGoodsTmpList.size(); i++) { - TbsActivityCenterGoods activityCenterGoods = activityCenterGoodsTmpList.get(i); - if( i+1 == activityCenterGoodsTmpList.size()){ - activityCenterGoods.setCenterGoodsRate(centerRateSurplus); - }else { - activityCenterGoods.setCenterGoodsRate(itemRate); - centerRateSurplus = centerRateSurplus.subtract(itemRate); + BigDecimal centerRateSurplus = n100; + BigDecimal itemRate = n100.divide(new BigDecimal(activityCenterGoodsTmpList.size()),1,RoundingMode.DOWN); + for (int i = 0; i < activityCenterGoodsTmpList.size(); i++) { + TbsActivityCenterGoods activityCenterGoods = activityCenterGoodsTmpList.get(i); + if( i+1 == activityCenterGoodsTmpList.size()){ + activityCenterGoods.setCenterGoodsRate(centerRateSurplus); + }else { + activityCenterGoods.setCenterGoodsRate(itemRate); + centerRateSurplus = centerRateSurplus.subtract(itemRate); + } + activityCenterGoodsMapper.updateById(activityCenterGoods); } - activityCenterGoodsMapper.updateById(activityCenterGoods); } } @@ -678,7 +678,6 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService } } - for (int ii = 0; ii < currentActivityCenterList.size(); ii++) { TbsActivityCenter activityCenter = activityCenterList.get(ii); boolean eqActivity = activityCenter.getActivityId().equals(subject.getActivityId()); 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 c5e1d9e6..4b0b3700 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 @@ -997,13 +997,14 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = buildSeeYonVerificationData(activity, sysUser, verification, saleRegionNames, bizRegionNames); - + String dataJson = JsonUtil.objectToJson(data); + log.warn("核销请求JSON,核销号：{}：{}",verification.getVerificationCode(),dataJson); BaseCreateProcessBo createProcess = new BaseCreateProcessBo(); createProcess.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code()); createProcess.setMemberLoginName(sysUser.getSyAccount()); createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_VERIFICATION + verification.getRemark()); createProcess.setTargetId(verification.getId()+""); - createProcess.setDataJson(JsonUtil.objectToJson(data)); + createProcess.setDataJson(dataJson); R flowIdResult = seeYonService.baseCreateProcess(createProcess); if(flowIdResult.getStatus()!=200){ Assert.throwEx("远程服务调用失败"); @@ -1119,15 +1120,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl activityCenter = activityCenterService.listByActivity(verification.getActivityId()); for(TbsActivityCenter center : activityCenter){ - TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),activity.getSupplierCode()); - subList.add(costCenter); - } - for (VtbSubjectDTO subjectDTO : subjectDTOList) { - subList.add(subjectDTO); + TbsCostSubItem.CostCenterTranStr costCenter = BirHttpUtil.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),activity.getSupplierCode()); + if(costCenter!=null){ + subList.add(costCenter); + } } } catch (Exception e) { e.printStackTrace(); } + subList.addAll(subjectDTOList); data.put("sub",subList); return data; }