政策查询调整;订单调整

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java

@@ -44,7 +44,6 @@ import java.util.stream.Collectors;
 public class OmsOrderController {
 
     private OmsOrderService omsOrderService;
-    private OmsOrderItemService omsOrderItemService;
     private BmsSupplierAddressService bmsSupplierAddressService;
     private SysUserService sysUserService;
 

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -80,6 +80,8 @@ public class OmsOrder implements Serializable {
     @NotNull(message = "品牌ID不能为空")
     private Long brandRuleId;
 
+    private String brandRuleName;
+
     /** 制单人id */
     @Length(max = 32,message = "制单人id长度不能超过32字")
     private String userId;
@@ -178,5 +180,6 @@ public class OmsOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate checkEndTime;
 
+
 }
 

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

@@ -230,7 +230,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         order.setId(param.getId());
         order.setOrderType(param.getOrderType());
         order.setSupplierAddrId(param.getSupplierAddrId());
+        GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(param.getBrandRuleId());
         order.setBrandRuleId(param.getBrandRuleId());
+        order.setBrandRuleName(categoryRule.getLabel());
         if(param.getSupplierId()!=null && !param.getSupplierId().equals(order.getSupplierId())){
             BmsSupplier supplier = bmsSupplierMapper.selectById(param.getSupplierId());
             order.setSupplierId(param.getSupplierId());
@@ -365,6 +367,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         OmsOrder order = new OmsOrder();
         order.setLatitudeFrom(confirmOrder.getLatitudeFrom().toLowerCase(Locale.ROOT));
         order.setOrderSn("SN"+CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
+
+        GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(order.getBrandRuleId());
+        order.setBrandRuleName(categoryRule.getLabel());
+
         order.setOrderType(confirmOrder.getOrderType());
         order.setSupplierId(Long.parseLong(supplier.getId()));
         order.setSupplierCode(supplier.getCode());

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -12,6 +12,9 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
+import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
@@ -69,6 +72,7 @@ public class TzcPolicyController {
     private SysPostUserService postUserService;
     private VtbVerificationService verificationService;
     private TbsBudgetLogService budgetLogService;
+    private BmsRegion2Service bmsRegion2Service;
 
     @GetMapping("succ")
     public R<?> succ(Long id,String all){
@@ -128,6 +132,8 @@ public class TzcPolicyController {
     @GetMapping("/pageMy")
     public R<PageVo<TzcPolicy>> getPageMy(TzcPolicy param){
         String userId = AuthContextUtils.getSysUserId();
+        List<String> cateIds = this.getCateIds(param.getCusProvince(),param.getCusCity(),param.getCusArea());
+        param.setCusCategoryIds(cateIds);
         param.setUserId(userId);
         PageUtil.startPage();
         List<TzcPolicy> list = tzcPolicyService.selectPolicyList(param);
@@ -143,6 +149,8 @@ public class TzcPolicyController {
     public R<PageVo<TzcPolicy>> getPageMyAndChild(TzcPolicy param){
         String userId = AuthContextUtils.getSysUserId();
         List<String> userIds = postUserService.listByChildIds(userId);
+        List<String> cateIds = this.getCateIds(param.getCusProvince(),param.getCusCity(),param.getCusArea());
+        param.setCusCategoryIds(cateIds);
         userIds.add(userId);
         param.setChildUserIds(userIds);
         PageUtil.startPage();
@@ -158,6 +166,8 @@ public class TzcPolicyController {
     @GetMapping("/page")
     @PreAuthorize("hasRole('tzc:policy:query')")
     public R<PageVo<TzcPolicy>> getPage(TzcPolicy param){
+        List<String> cateIds = this.getCateIds(param.getCusProvince(),param.getCusCity(),param.getCusArea());
+        param.setCusCategoryIds(cateIds);
         PageUtil.startPage();
         List<TzcPolicy> list = tzcPolicyService.selectPolicyList(param);
         return R.byPageHelperList(list);
@@ -465,5 +475,38 @@ public class TzcPolicyController {
         return R.ok();
     }
 
+
+    private List<String> getCateIds(String province,String city,String area){
+        LambdaQueryWrapper<BmsRegion2> region2Lqw = new LambdaQueryWrapper<>();
+        boolean search = false;
+        if(StringUtils.hasText(province)){
+            search = true;
+            region2Lqw.or(an->{
+                    an.like(BmsRegion2::getName,province)
+                            .eq(BmsRegion2::getLevel,1);
+            });
+        }
+        if(StringUtils.hasText(city)){
+            search = true;
+            region2Lqw.or(an->{
+                an.like(BmsRegion2::getName,city)
+                        .eq(BmsRegion2::getLevel,2);
+            });
+        }
+        if(StringUtils.hasText(area)){
+            search = true;
+            region2Lqw.or(an->{
+                an.like(BmsRegion2::getName,area)
+                        .eq(BmsRegion2::getLevel,3);
+            });
+        }
+        if(!search){
+            return null;
+        }
+        region2Lqw.select(BmsRegion2::getId);
+        List<BmsRegion2> bmsRegion2List = bmsRegion2Service.list(region2Lqw);
+        return bmsRegion2List.stream().map(BmsRegion2::getId).collect(Collectors.toList());
+    }
+
 }
 

src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java

@@ -148,6 +148,21 @@ public class TzcPolicy implements Serializable {
     private String extUserCode;
     private String extUserName;
 
+    /**
+     * 客户省
+     */
+    @TableField(exist = false)
+    String cusProvince;
+    /**
+     * 客户市
+     */
+    @TableField(exist = false)
+    String cusCity;
+    /**
+     * 客户区
+     */
+    @TableField(exist = false)
+    String cusArea;
 
     /**
      * 下属ID
@@ -158,6 +173,9 @@ public class TzcPolicy implements Serializable {
     @TableField(exist = false)
     List<?> policyItemList;
 
+    @TableField(exist = false)
+    private List<String> cusCategoryIds;
+
     public boolean allowEditFlag(){
         if(!this.getPolicyStatus().equals(TzcPolicyStatus.Status_0_UnCommit)
                 && !this.getPolicyStatus().equals(TzcPolicyStatus.Status_4_RollBack)){