产品修改

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseItemCategory.java

@@ -0,0 +1,26 @@
+package com.njzscloud.dispose.finance.expenseItem.constant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：expense_item_category
+ * 字典名称：收费项目类型
+ *
+ * @author ljw
+ */
+@Getter
+@RequiredArgsConstructor
+public enum ExpenseItemCategory implements DictStr {
+    QiTa("QiTa", "其他"),
+
+    ChanPin("ChanPin", "产品"),
+
+    YunFei("YunFei", "运费"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseStrategy.java

@@ -0,0 +1,30 @@
+package com.njzscloud.dispose.finance.expenseItem.constant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import com.njzscloud.common.core.ienum.DictStr;
+/**
+ * 字典代码：expense_strategy
+ * 字典名称：计费策略
+ * @author ljw
+ */
+@Getter
+@RequiredArgsConstructor
+public enum ExpenseStrategy implements DictStr {
+    MianFei("MianFei", "免费"),
+
+    TanXing("TanXing", "弹性"),
+
+    GuDing("GuDing", "固定"),
+
+    Che("Che", "车"),
+
+    Fang("Fang", "方"),
+
+    JuLi("JuLi", "距离"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/Payer.java

@@ -0,0 +1,28 @@
+package com.njzscloud.dispose.finance.expenseItem.constant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import com.njzscloud.common.core.ienum.DictStr;
+/**
+ * 字典代码：payer
+ * 字典名称：付费方
+ * @author ljw
+ */
+@Getter
+@RequiredArgsConstructor
+public enum Payer implements DictStr {
+    PingTai("PingTai", "平台"),
+
+    ChanFei("ChanFei", "产废方"),
+
+    QingYun("QingYun", "清运方"),
+
+    XiaoNa("XiaoNa", "消纳方"),
+
+    CaiGou("CaiGou", "采购方"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ScopeStrategy.java

@@ -0,0 +1,23 @@
+package com.njzscloud.dispose.finance.expenseItem.constant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import com.njzscloud.common.core.ienum.DictStr;
+/**
+ * 字典代码：scope_strategy
+ * 字典名称：适用用户
+ * @author ljw
+ */
+@Getter
+@RequiredArgsConstructor
+public enum ScopeStrategy implements DictStr {
+
+    ZhiDing("ZhiDing", "指定"),
+
+    SuoYou("SuoYou", "所有"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java

@@ -1,9 +1,13 @@
 package com.njzscloud.dispose.finance.expenseItem.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
+import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseStrategy;
+import com.njzscloud.dispose.finance.expenseItem.constant.Payer;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -13,6 +17,7 @@ import java.math.BigDecimal;
 
 /**
  * 收费项目
+ *
  * @author ljw
  */
 @Getter
@@ -33,6 +38,8 @@ public class ExpenseItemEntity extends BaseEntity {
      */
     private String expenseItemCategory;
 
+    @TableField(exist = false)
+    private String expenseItemCategoryName;
     /**
      * 付费项名称
      */
@@ -43,6 +50,9 @@ public class ExpenseItemEntity extends BaseEntity {
      */
     private String expenseStrategy;
 
+    @TableField(exist = false)
+    private String expenseStrategyName;
+
     /**
      * 计量单位；字典代码：unit
      */
@@ -58,6 +68,9 @@ public class ExpenseItemEntity extends BaseEntity {
      */
     private String payer;
 
+    @TableField(exist = false)
+    private String payerName;
+
     /**
      * 单价；单位：元，弹性模式-->每档价格
      */
@@ -103,5 +116,46 @@ public class ExpenseItemEntity extends BaseEntity {
      */
     private String memo;
 
+    private Long goodsId;
+
+    public String getExpenseItemCategoryName() {
+        if (expenseItemCategory == null) {
+            return null;
+        }
+        for (ExpenseItemCategory type : ExpenseItemCategory.values()) {
+            if (type.getVal().equals(expenseItemCategory)) {
+                expenseItemCategoryName = type.getTxt();
+                break;
+            }
+        }
+        return expenseItemCategoryName;
+    }
+
+    public String getExpenseStrategyName() {
+        if (expenseStrategy == null) {
+            return null;
+        }
+        for (ExpenseStrategy type : ExpenseStrategy.values()) {
+            if (type.getVal().equals(expenseStrategy)) {
+                expenseStrategyName = type.getTxt();
+                break;
+            }
+        }
+        return expenseStrategyName;
+    }
+
+    public String getPayerName() {
+        if (payer == null) {
+            return null;
+        }
+        for (Payer type : Payer.values()) {
+            if (type.getVal().equals(payer)) {
+                payerName = type.getTxt();
+                break;
+            }
+        }
+        return payerName;
+    }
+
 }
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java

@@ -1,7 +1,9 @@
 package com.njzscloud.dispose.goods.goods.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
+import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -9,6 +11,7 @@ import lombok.experimental.Accessors;
 
 /**
  * 产品
+ *
  * @author ljw
  */
 @Getter
@@ -77,6 +80,13 @@ public class GoodsEntity extends BaseEntity {
      * 备注
      */
     private String memo;
+
+    /**
+     * 关联收费项目信息（返回用）
+     */
+    @TableField(exist = false)
+    private ExpenseItemEntity expenseItem;
+
 }
 
 

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService;
 import com.njzscloud.dispose.goods.goods.mapper.GoodsMapper;
 import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity;
 import com.njzscloud.dispose.goods.goods.service.GoodsService;
@@ -23,20 +26,36 @@ import java.util.List;
 @RequiredArgsConstructor
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> implements GoodsService {
 
+    private final ExpenseItemService expenseItemService;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void add(GoodsEntity goodsEntity) {
         this.save(goodsEntity);
+        ExpenseItemEntity expenseItem = goodsEntity.getExpenseItem();
+        expenseItem.setGoodsId(goodsEntity.getId());
+        expenseItem.setExpenseItemCategory(ExpenseItemCategory.ChanPin.getVal());
+        expenseItem.setExpenseItemName(goodsEntity.getGoodsName());
+        // goodsScope默认传{strategy: 'ZhiDing',ids:[goodsEntity.getId()]}
+        expenseItem.setGoodsScope("{\"strategy\":\"ZhiDing\",\"ids\":[" + goodsEntity.getId() + "]}");
+        expenseItemService.save(expenseItem);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void modify(GoodsEntity goodsEntity) {
         this.updateById(goodsEntity);
+        expenseItemService.updateById(goodsEntity.getExpenseItem());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void del(List<Long> ids) {
+        // 删除产品
         this.removeBatchByIds(ids);
+        // 删除对应的费用配置
+        expenseItemService.remove(Wrappers.<ExpenseItemEntity>lambdaQuery()
+            .in(ExpenseItemEntity::getGoodsId, ids));
     }
 
     @Override

njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml

@@ -19,6 +19,7 @@
         <result column="goods_scope" property="goodsScope"/>
         <result column="canuse" property="canuse"/>
         <result column="memo" property="memo"/>
+        <result column="goods_id" property="goodsId"/>
         <result column="creator_id" property="creatorId"/>
         <result column="modifier_id" property="modifierId"/>
         <result column="create_time" property="createTime"/>
@@ -29,7 +30,7 @@
     <sql id="Base_Column_List">
         id, expense_item_category, expense_item_name, expense_strategy, unit, tax_rate, payer,
         unit_price, initial_price, initial_quantity, every_quantity, user_scope, station_scope,
-        goods_scope, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted
+        goods_scope, canuse, memo, goods_id, creator_id, modifier_id, create_time, modify_time, deleted
     </sql>
 
     <select id="getById" resultMap="ExpenseItemResultMap">