移动端定/调价审批修复

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);
 

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<SysUserVo> 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());

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<SmsPricestra
                     for (SmsGoods smsGood : smsGoods) {
                         BigDecimal cost = smsGood.getCost();
                         for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
-                            if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
+                            /*if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                                 BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
                                 cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
                                 smsGoodsService.updateSalesPrice(smsGood.getSid(), cost.toString());
+                            }*/
+                            BigDecimal rangeStart = smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart();
+                            BigDecimal rangeEnd = smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd();
+
+                            boolean inRange = true;
+                            if (rangeStart != null) {
+                                inRange &= cost.compareTo(rangeStart) >= 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());
                             }
                         }
                     }