产品新增

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/ExpenseItemController.java

@@ -4,6 +4,8 @@ import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.pojo.param.AddExpenseItemParam;
+import com.njzscloud.dispose.finance.pojo.param.ModifyExpenseItemParam;
 import com.njzscloud.dispose.finance.service.ExpenseItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,8 +29,8 @@ public class ExpenseItemController {
      * 新增
      */
     @PostMapping("/add")
-    public R<?> add(@RequestBody ExpenseItemEntity expenseItemEntity) {
-        expenseItemService.add(expenseItemEntity);
+    public R<?> add(@RequestBody AddExpenseItemParam addExpenseItemParam) {
+        expenseItemService.add(addExpenseItemParam);
         return R.success();
     }
 
@@ -36,8 +38,8 @@ public class ExpenseItemController {
      * 修改
      */
     @PostMapping("/modify")
-    public R<?> modify(@RequestBody ExpenseItemEntity expenseItemEntity) {
-        expenseItemService.modify(expenseItemEntity);
+    public R<?> modify(@RequestBody ModifyExpenseItemParam modifyExpenseItemParam) {
+        expenseItemService.modify(modifyExpenseItemParam);
         return R.success();
     }
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/param/ModifyExpenseItemParam.java

@@ -0,0 +1,98 @@
+package com.njzscloud.dispose.finance.pojo.param;
+
+import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.constant.ExpenseStrategy;
+import com.njzscloud.dispose.finance.constant.Payer;
+import com.njzscloud.dispose.finance.pojo.entity.ScopeStrategyConfig;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class ModifyExpenseItemParam {
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 收费项目类型，QiTa-->其他、ChanPin-->产品、YunFei-->运费
+     */
+    private ExpenseItemCategory expenseItemCategory;
+
+    /**
+     * 付费项名称
+     */
+    private String expenseItemName;
+
+    /**
+     * 计费策略；字典代码：expense_strategy
+     */
+    private ExpenseStrategy expenseStrategy;
+
+    /**
+     * 计量单位；字典代码：unit
+     */
+    private String unit;
+
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 付费方；字典代码：payer
+     */
+    private Payer payer;
+
+    /**
+     * 单价；单位：元，弹性模式-->每档价格
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 起步价；单位：元，<= 起步量 固定费用
+     */
+    private BigDecimal initialPrice;
+
+    /**
+     * 起步量
+     */
+    private Integer initialQuantity;
+
+    /**
+     * 每档的量
+     */
+    private Integer everyQuantity;
+
+    /**
+     * 适用用户；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+     */
+    private ScopeStrategyConfig userScope;
+
+    /**
+     * 适用站点；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+     */
+    private ScopeStrategyConfig stationScope;
+
+    /**
+     * 适用产品；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+     */
+    private ScopeStrategyConfig goodsScope;
+    /**
+     * 产品 Id
+     */
+    private Long goodsId;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/ExpenseItemService.java

@@ -5,6 +5,7 @@ import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 import com.njzscloud.dispose.finance.pojo.param.AddExpenseItemParam;
+import com.njzscloud.dispose.finance.pojo.param.ModifyExpenseItemParam;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ExpenseItemService extends IService<ExpenseItemEntity> {
     /**
      * 修改
      */
-    void modify(ExpenseItemEntity expenseItemEntity);
+    void modify(ModifyExpenseItemParam modifyExpenseItemParam);
 
     /**
      * 删除

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/ExpenseItemServiceImpl.java

@@ -8,6 +8,7 @@ import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.dispose.finance.mapper.ExpenseItemMapper;
 import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 import com.njzscloud.dispose.finance.pojo.param.AddExpenseItemParam;
+import com.njzscloud.dispose.finance.pojo.param.ModifyExpenseItemParam;
 import com.njzscloud.dispose.finance.service.ExpenseItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,8 +39,8 @@ public class ExpenseItemServiceImpl extends ServiceImpl<ExpenseItemMapper, Expen
      * 修改
      */
     @Override
-    public void modify(ExpenseItemEntity expenseItemEntity) {
-        this.updateById(expenseItemEntity);
+    public void modify(ModifyExpenseItemParam modifyExpenseItemParam) {
+        this.updateById(BeanUtil.copyProperties(modifyExpenseItemParam, ExpenseItemEntity.class));
     }
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java

@@ -5,6 +5,7 @@ import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
 import com.njzscloud.dispose.goods.pojo.param.AddGoodsParam;
+import com.njzscloud.dispose.goods.pojo.param.ModifyGoodsParam;
 import com.njzscloud.dispose.goods.service.GoodsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,8 +38,8 @@ public class GoodsController {
      * 修改
      */
     @PostMapping("/modify")
-    public R<?> modify(@RequestBody GoodsEntity goodsEntity) {
-        goodsService.modify(goodsEntity);
+    public R<?> modify(@RequestBody ModifyGoodsParam modifyGoodsParam) {
+        goodsService.modify(modifyGoodsParam);
         return R.success();
     }
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/param/ModifyGoodsParam.java

@@ -0,0 +1,176 @@
+package com.njzscloud.dispose.goods.pojo.param;
+
+import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.constant.ExpenseStrategy;
+import com.njzscloud.dispose.finance.constant.Payer;
+import com.njzscloud.dispose.finance.pojo.entity.ScopeStrategyConfig;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 产品
+ *
+ * @author ljw
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class ModifyGoodsParam {
+    /**
+     * 产品 Id
+     */
+    private Long id;
+
+    /**
+     * 产品类型 Id
+     */
+    private Long goodsCategoryId;
+
+    /**
+     * 商品编码
+     */
+    private String sn;
+
+    /**
+     * 产品名称
+     */
+    private String goodsName;
+
+    /**
+     * 规格
+     */
+    private String specParams;
+
+    /**
+     * 图片
+     */
+    private String picture;
+
+    /**
+     * 计量单位；字典代码：unit
+     */
+    private String unit;
+
+    /**
+     * 是否为成品；0-->否、1-->是
+     */
+    private Boolean fg;
+
+    /**
+     * 是否为半成品；0-->否、1-->是
+     */
+    private Boolean sfg;
+
+    /**
+     * 是否为原料；0-->否、1-->是
+     */
+    private Boolean rg;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否可用；0-->否、1-->是
+     */
+    private Boolean canuse;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 付费配置
+     */
+    private ExpenseItem expenseItem;
+
+    @Getter
+    @Setter
+    @ToString
+    @Accessors(chain = true)
+    public static class ExpenseItem {
+        /**
+         * 付费项 Id
+         */
+        private Long id;
+
+
+        /**
+         * 收费项目类型，QiTa-->其他、ChanPin-->产品、YunFei-->运费
+         */
+        private ExpenseItemCategory expenseItemCategory;
+
+        /**
+         * 计费策略；字典代码：expense_strategy
+         */
+        private ExpenseStrategy expenseStrategy;
+
+        /**
+         * 计量单位；字典代码：unit
+         */
+        private String unit;
+
+        /**
+         * 税率
+         */
+        private BigDecimal taxRate;
+
+        /**
+         * 付费方；字典代码：payer
+         */
+        private Payer payer;
+
+        /**
+         * 单价；单位：元，弹性模式-->每档价格
+         */
+        private BigDecimal unitPrice;
+
+        /**
+         * 起步价；单位：元，<= 起步量 固定费用
+         */
+        private BigDecimal initialPrice;
+
+        /**
+         * 起步量
+         */
+        private Integer initialQuantity;
+
+        /**
+         * 每档的量
+         */
+        private Integer everyQuantity;
+
+        /**
+         * 适用用户；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+         */
+        private ScopeStrategyConfig userScope;
+
+        /**
+         * 适用站点；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+         */
+        private ScopeStrategyConfig stationScope;
+
+        /**
+         * 适用产品；结构类型：{strategy: Wu | ZhiDing | SuoYou,ids:long[]}
+         */
+        private ScopeStrategyConfig goodsScope;
+
+        /**
+         * 备注
+         */
+        private String memo;
+        /**
+         * 产品 Id
+         */
+        private Long goodsId;
+    }
+}
+
+

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java

@@ -5,6 +5,7 @@ import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
 import com.njzscloud.dispose.goods.pojo.param.AddGoodsParam;
+import com.njzscloud.dispose.goods.pojo.param.ModifyGoodsParam;
 
 import java.util.List;
 
@@ -16,7 +17,7 @@ public interface GoodsService extends IService<GoodsEntity> {
 
     void add(AddGoodsParam addGoodsParam);
 
-    void modify(GoodsEntity goodsEntity);
+    void modify(ModifyGoodsParam modifyGoodsParam);
 
     void del(List<Long> ids);
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java

@@ -10,10 +10,12 @@ import com.njzscloud.common.sn.support.SnUtil;
 import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
 import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 import com.njzscloud.dispose.finance.pojo.param.AddExpenseItemParam;
+import com.njzscloud.dispose.finance.pojo.param.ModifyExpenseItemParam;
 import com.njzscloud.dispose.finance.service.ExpenseItemService;
 import com.njzscloud.dispose.goods.mapper.GoodsMapper;
 import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
 import com.njzscloud.dispose.goods.pojo.param.AddGoodsParam;
+import com.njzscloud.dispose.goods.pojo.param.ModifyGoodsParam;
 import com.njzscloud.dispose.goods.service.GoodsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +43,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         addGoodsParam.setSn(sn);
         GoodsEntity goodsEntity = BeanUtil.copyProperties(addGoodsParam, GoodsEntity.class);
         this.save(goodsEntity);
-        // 付费项新增
+        // 付费项
         AddGoodsParam.ExpenseItem expenseItem = addGoodsParam.getExpenseItem();
 
         String goodsName = addGoodsParam.getGoodsName();
@@ -55,9 +57,17 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modify(GoodsEntity goodsEntity) {
+    public void modify(ModifyGoodsParam modifyGoodsParam) {
+        GoodsEntity goodsEntity = BeanUtil.copyProperties(modifyGoodsParam, GoodsEntity.class).setSn(null);
         this.updateById(goodsEntity);
-        expenseItemService.updateById(goodsEntity.getExpenseItem());
+        // 付费项
+        ModifyGoodsParam.ExpenseItem expenseItem = modifyGoodsParam.getExpenseItem();
+
+        String goodsName = modifyGoodsParam.getGoodsName();
+        ModifyExpenseItemParam modifyExpenseItemParam = BeanUtil.copyProperties(expenseItem, ModifyExpenseItemParam.class)
+            .setExpenseItemName(goodsName)
+            .setMemo(goodsName + "费用配置");
+        expenseItemService.modify(modifyExpenseItemParam);
     }
 
     @Override