特定模板不支持政策修复；产品移除商城结构

src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@@ -111,11 +111,11 @@ public class GoodsSkuController {
     @PostMapping("/update")
     @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('goods:sku:update')")
-    public R<?> update(@RequestBody GoodsSkuBo param){
+    public R<?> update(@RequestBody @Valid GoodsSkuBo param){
         if(param.getSkuId()==null){
             return R.error();
         }
-        goodsSkuService.editSku(param);
+        goodsSkuService.editSku2(param);
         return R.ok();
     }
 
@@ -144,8 +144,8 @@ public class GoodsSkuController {
     @PostMapping("/save")
     @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('goods:sku:update')")
-    public R<?> save(@RequestBody GoodsSkuBo param){
-        goodsSkuService.editSku(param);
+    public R<?> save(@RequestBody @Valid GoodsSkuBo param){
+        goodsSkuService.editSku2(param);
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java

@@ -93,8 +93,18 @@ public class GoodsSku implements Serializable {
     /** 备注 */
     private String remark;
 
+    /** 产地 */
+    @NotNull(message = "产地不能为空")
     private String belong;
 
+    /** 包装 */
+    @NotNull(message = "包装不能为空")
+    private String wrapVal;
+
+    /** 口味 */
+    @NotNull(message = "口味不能为空")
+    private String tasteVal;
+
     /** 最后更新时间 */
     @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;

src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryRuleBo.java

@@ -27,6 +27,8 @@ public class GoodsCategoryRuleBo {
     /** 启用状态 */
     private Integer enableFlag;
 
+    private Integer sort;
+
     /** 备注 */
     private String remark;
 

src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java

@@ -66,7 +66,7 @@ public class GoodsSkuBo implements Serializable {
     /** 备注 */
     private String remark;
 
-    /** 规格值Ids(更新操作可为空) */
+    /** 已取消：规格值Ids(更新操作可为空) */
     private List<Long> specValueIds;
 
     /** 可投放费用标识 */
@@ -75,8 +75,20 @@ public class GoodsSkuBo implements Serializable {
     /** 下单标识 */
     private Integer orderFlag;
 
+    /** 产地 */
+    @NotNull(message = "产地不能为空")
     private String belong;
 
+    /** 包装 */
+    @NotNull(message = "包装不能为空")
+    private String wrapVal;
+
+    /** 口味 */
+    @NotNull(message = "口味不能为空")
+    private String tasteVal;
+
     private Integer specialFlag;
+
+
 }
 

src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java

@@ -38,5 +38,11 @@ public interface GoodsSkuService extends IService<GoodsSku> {
 
     void editSku(GoodsSkuBo goodSkuVo);
 
+    /**
+     * 移除商城解构
+     * @param goodSkuVo
+     */
+    void editSku2(GoodsSkuBo goodSkuVo);
+
 }
 

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -228,5 +228,66 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
 
     }
 
+    @Override
+    public void editSku2(GoodsSkuBo goodSkuVo) {
+        GoodsSku dbGoodSku = null;
+        if(goodSkuVo.getSkuId()!=null){
+            dbGoodSku = this.getById(goodSkuVo.getSkuId());
+            if(dbGoodSku==null){
+                Assert.throwEx("数据不存在");
+            }
+        }
+        GoodsSku goodsSku = CopierUtil.copy(goodSkuVo,new GoodsSku());
+        if(dbGoodSku!=null){
+            if(goodsSku.getSpuId()!=null&&!goodsSku.getSpuId().equals(dbGoodSku.getSpuId())){
+                Assert.throwEx("规格编码已被其它商品使用");
+            }
+            goodsSku.setId(dbGoodSku.getId());
+        }
+        if(goodSkuVo.getSpecValueIds()!=null){
+            if(goodSkuVo.getSpecValueIds().size()!= GoodsConst.SPEC_COUNT){
+                Assert.throwEx("规格值数量缺失");
+            }
+            List<GoodsSpecValue> goodsSpecValues = goodsSpecValueService.listByIds(goodSkuVo.getSpecValueIds());
+            Set<Long> specIds = goodsSpecValues.stream().map(GoodsSpecValue::getSpecId).collect(Collectors.toSet());
+            if(specIds.size()!=GoodsConst.SPEC_COUNT){
+                Assert.throwEx("规格数量缺失");
+            }
+            //校验规格值
+            String specInfos = goodsSku.getBelong().trim()+";"+goodsSku.getTasteVal().trim()+";"+goodsSku.getWrapVal().trim();
+            LambdaQueryWrapper<GoodsSku> checkSkuSpec = new LambdaQueryWrapper<>();
+            checkSkuSpec.eq(GoodsSku::getSpuId,goodsSku.getId());
+            checkSkuSpec.eq(GoodsSku::getSpecInfos,specInfos);
+            if(goodsSku.getId()!=null){
+                checkSkuSpec.ne(GoodsSku::getId,goodsSku.getId());
+            }
+            Long checkSkuSpecCount = super.count(checkSkuSpec);
+            if(checkSkuSpecCount>0){
+                Assert.throwEx("相同规格已存在");
+            }
+            goodsSku.setSpecInfos(specInfos);
+            this.saveOrUpdate(goodsSku);
+
+        }else {
+            this.updateById(goodsSku);
+        }
+        //更新特殊标识
+        LambdaQueryWrapper<GoodsSku> specialSkuLqw = new LambdaQueryWrapper<>();
+        specialSkuLqw.eq(GoodsSku::getSpecialFlag,1);
+        specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId());
+        List<GoodsSku> specialSkuList = super.list(specialSkuLqw);
+        if(specialSkuList.size()>0){
+            GoodsSku goodsSku1 = specialSkuList.get(0);
+            GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class);
+            GoodsSpu spu = new GoodsSpu();
+            spu.setId(goodsSku1.getSpuId());
+            if(goodSkuVo.getSpecialFlag().equals(1)){
+                spu.setSpecialSkuId(goodsSku1.getId());
+            }else {
+                spu.setSpecialSkuId(0L);
+            }
+            spuMapper.updateById(spu);
+        }
+    }
 }
 

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

@@ -85,10 +85,12 @@ public class OmsOrder implements Serializable {
 
     /** 制单人名称 */
     @Length(max = 20,message = "制单人名称长度不能超过20字")
+    @TableField(condition = SqlCondition.LIKE)
     private String userName;
 
     /** 制单人ERP编码 */
     @Length(max = 32,message = "制单人ERP编码长度不能超过32字")
+    @TableField(condition = SqlCondition.LIKE)
     private String userCode;
 
     /** 制单人手机号 */

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -569,6 +569,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("targetId", tbsCostApply.getId()+"");
         data.put("targetCode", tbsCostApply.getCode());
         data.put("exsp1",TbsSeeYonConst.CostApplyContractConf.Code());
+        data.put("templateId",tbsCostApply.getTemplateId());
+        data.put("templateName",tbsCostApply.getTemplateTitle());
         //添加跳转地址业务
         String urlKey = "exsp5";
         String baseJumpUrl = JumpToUtil.getJumpUrl(projectProperties.getWebUrl(),TbsSeeYonConst.CostApplyConf.Code(),id);
@@ -902,6 +904,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("targetCode", tbsCostApply.getCode());
         data.put("exsp1",TbsSeeYonConst.CostApplyConf.Code());
         data.put("money", tbsCostApply.getTotalActivityAmount());
+        data.put("templateId",tbsCostApply.getTemplateId());
+        data.put("templateName",tbsCostApply.getTemplateTitle());
 
         //记录主表费率参数
         try {

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -422,6 +422,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             );
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
+            budgetLqw.eq(TbsBudget::getTemplateFlag,0);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);
         }else {
             budgetList = new ArrayList<>();