From ca84c368ea4d1f7904dfec1513563a723a1aa496 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 16 Apr 2025 13:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=9A/=E8=B0=83?= =?UTF-8?q?=E4=BB=B7=E5=AE=A1=E6=89=B9=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPricestrategyBillFeign.java | 8 ++++---- .../AppPricestrategyBillService.java | 8 ++++---- .../SmsPricestrategyBillService.java | 19 ++++++++++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java index 23f6a05d52..48ac63a154 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java @@ -23,22 +23,22 @@ public interface AppPricestrategyBillFeign { /**********************************************流程********************************************/ @ApiOperation("办理") - @PutMapping("/agreeCreditInfo") + @PutMapping("/agreeSpriceInfo") @ResponseBody ResultBean agreeCreditInfo(@RequestBody PricestrategyBillDto dto); @ApiOperation("驳回") - @PutMapping("/rejectCreditInfo") + @PutMapping("/rejectSpriceInfo") @ResponseBody ResultBean rejectCreditInfo(@RequestBody PricestrategyBillTaskQuery query); @ApiOperation("撤回") - @PutMapping("/recallCreditInfo") + @PutMapping("/recallSpriceInfo") @ResponseBody ResultBean recallCreditInfo(@RequestBody PricestrategyBillTaskQuery query); @ApiOperation("终止") - @PutMapping("/stopCreditInfo") + @PutMapping("/stopSpriceInfo") @ResponseBody ResultBean stopCreditInfo(@RequestBody PricestrategyBillTaskQuery query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java index 45600c0309..5d6e6a9b98 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java @@ -72,7 +72,7 @@ public class AppPricestrategyBillService { }else { String strategyDescribe = ""; for (AppPricestrategyBillGoodstypedetailDetailsVo appPricestrategyBillGoodstypedetailDetailsVo : appPricestrategyBillGoodstypedetailDetailsVos) { - strategyDescribe = strategyDescribe + appPricestrategyBillGoodstypedetailDetailsVo.getRangeStart() + "——" + appPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd() + " " + appPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate() + "; "; + strategyDescribe = strategyDescribe + appPricestrategyBillGoodstypedetailDetailsVo.getRangeStart() + "-" + appPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd() + " " + appPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate() + "%; "; } appPricestrategyBillDetailDetailsVo.setStrategyDescribe(strategyDescribe); } @@ -82,7 +82,7 @@ public class AppPricestrategyBillService { public ResultBean agreeCreditInfo(PricestrategyBillDto dto) { ResultBean rb = ResultBean.fireFail(); - //根据用户sid获取staffSid + /*//根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { return rb.setMsg(userVoResultBean.getMsg()); @@ -93,10 +93,10 @@ public class AppPricestrategyBillService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();*/ SmsPricestrategyBillCompleteDto completeInventoryProfitinDto = new SmsPricestrategyBillCompleteDto(); BeanUtil.copyProperties(dto, completeInventoryProfitinDto); - completeInventoryProfitinDto.setOrgPath(orgSidPath); +// completeInventoryProfitinDto.setOrgPath(orgSidPath); ResultBean resultBean = smsPricestrategyBillFeign.complete(completeInventoryProfitinDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java index 4d11036e98..04010da454 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java @@ -67,6 +67,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -437,10 +438,26 @@ public class SmsPricestrategyBillService extends MybatisBaseService= 0; + } + if (rangeEnd != null) { + inRange &= cost.compareTo(rangeEnd) <= 0; + } + + if (inRange) { + BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); + cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP)); + smsGoodsService.updateSalesPrice(smsGood.getSid(), cost.toString()); } } }