押金库存

src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.java

@@ -24,7 +24,7 @@ public interface SystemConfigMapper{
 
     List<SystemConfig> querySystemConfigByPage(Map<String, Object> parameter);
 
-    int delete(String id);
+    int delete(SystemConfig record);
 
     SystemConfig querySystemConfig(SystemConfig record);
 

src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.xml

@@ -12,6 +12,8 @@
                                 <result column="tixian_rate" property="tixianRate" jdbcType="VARCHAR" />
                                 <result column="extra" property="extra" jdbcType="VARCHAR" />
                                 <result column="use_flag" property="useFlag" jdbcType="CHAR" />
+                                <result column="personal_deposit" property="personalDeposit" jdbcType="INTEGER" />
+                                <result column="company_deposit" property="companyDeposit" jdbcType="INTEGER" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -35,6 +37,10 @@
 
             use_flag,
 
+            personal_deposit,
+
+            company_deposit,
+
             </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -79,6 +85,12 @@
             </if>
                 <if test="useFlag!= null" >
                 use_flag,
+            </if>
+                <if test="personalDeposit!= null" >
+                personal_deposit,
+            </if>
+                <if test="companyDeposit!= null" >
+                company_deposit,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -111,6 +123,12 @@
             </if>
                     <if test="useFlag != null" >
                 #{useFlag,jdbcType=CHAR},
+            </if>
+                    <if test="personalDeposit != null" >
+                #{personalDeposit,jdbcType=INTEGER},
+            </if>
+                    <if test="companyDeposit != null" >
+                #{companyDeposit,jdbcType=INTEGER},
             </if>
                 </trim>
     </insert>
@@ -146,14 +164,31 @@
             </if>
                      <if test="useFlag != null" >
                use_flag= #{useFlag,jdbcType=CHAR},
+            </if>
+                     <if test="personalDeposit != null" >
+               personal_deposit= #{personalDeposit,jdbcType=INTEGER},
+            </if>
+                     <if test="companyDeposit != null" >
+               company_deposit= #{companyDeposit,jdbcType=INTEGER},
             </if>
                  </set>
-        where id = #{id,jdbcType=INTEGER}
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
     </update>
     <select id="querySystemConfigByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
         select <include refid="Base_Column_List"/> from system_config
         <where>
             and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
                     <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and  id = #{record.id}
             </if>
@@ -183,6 +218,12 @@
             </if>
                      <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
                 and  use_flag = #{record.useFlag}
+            </if>
+                     <if test="record.personalDeposit != null and !&quot;&quot;.equals(record.personalDeposit)">
+                and  personal_deposit = #{record.personalDeposit}
+            </if>
+                     <if test="record.companyDeposit != null and !&quot;&quot;.equals(record.companyDeposit)">
+                and  company_deposit = #{record.companyDeposit}
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
@@ -190,6 +231,8 @@
                                                                                                     OR  tixian_rate LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  extra LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  use_flag LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  personal_deposit LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  company_deposit LIKE concat('%',#{record.searchKey},'%')
                                                              </trim>
          </if>
 
@@ -249,6 +292,9 @@
         select <include refid="Base_Column_List"/> from system_config
         <where>
             and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
                     <if test="id != null and !&quot;&quot;.equals(id)">
                 and  id = #{id}
             </if>
@@ -278,6 +324,12 @@
             </if>
                     <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
                 and  use_flag = #{useFlag}
+            </if>
+                    <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
+                and  personal_deposit = #{personalDeposit}
+            </if>
+                    <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
+                and  company_deposit = #{companyDeposit}
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
@@ -285,6 +337,8 @@
                                                                                                                                                         OR  tixian_rate LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  extra LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  use_flag LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  personal_deposit LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  company_deposit LIKE concat('%',#{searchKey},'%')
                                                                                         </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -372,6 +426,12 @@
             </if>
                      <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
                 and use_flag = #{useFlag}
+            </if>
+                     <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
+                and personal_deposit = #{personalDeposit}
+            </if>
+                     <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
+                and company_deposit = #{companyDeposit}
             </if>
          
         </where>
@@ -379,15 +439,20 @@
     </select>
     <update id="delete">
         UPDATE system_config SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
         select <include refid="Base_Column_List"/> from system_config
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/model/SystemConfig.java

@@ -18,6 +18,10 @@ public class SystemConfig{
     private String tixianRate;
     private String extra;
     private String useFlag;
+    private Integer personalDeposit;
+    private Integer companyDeposit;
+
+private String idStr;
 
 private String searchKey;
 
@@ -101,6 +105,20 @@ private String orderByStr;
     public void setUseFlag(String useFlag){
         this.useFlag = useFlag;
     }
+    public Integer getPersonalDeposit(){
+        return this.personalDeposit;
+    }
+
+    public void setPersonalDeposit(Integer personalDeposit){
+        this.personalDeposit = personalDeposit;
+    }
+    public Integer getCompanyDeposit(){
+        return this.companyDeposit;
+    }
+
+    public void setCompanyDeposit(Integer companyDeposit){
+        this.companyDeposit = companyDeposit;
+    }
 
 public String getSearchKey() {
     return searchKey;
@@ -126,5 +144,13 @@ public void setOrderByStr(String orderByStr) {
     this.orderByStr = orderByStr;
 }
 
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
 }
 

src/main/java/com/izouma/awesomeadmin/service/SystemConfigService.java

@@ -20,7 +20,7 @@ public interface SystemConfigService{
 
     boolean createSystemConfig(SystemConfig record);
 
-    boolean deleteSystemConfig(String id);
+    boolean deleteSystemConfig(SystemConfig record);
 
     boolean updateSystemConfig(SystemConfig record);
 }

src/main/java/com/izouma/awesomeadmin/service/impl/SystemConfigServiceImpl.java

@@ -99,12 +99,12 @@ public class SystemConfigServiceImpl implements SystemConfigService{
     }
 
     @Override
-    public boolean deleteSystemConfig(String id) {
+    public boolean deleteSystemConfig(SystemConfig record) {
 
         logger.info("deleteSystemConfig");
         try {
 
-             int updates = systemConfigMapper.delete(id);
+             int updates = systemConfigMapper.delete(record);
 
             if (updates > 0) {
                  return true;

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -213,6 +213,16 @@ public class UserOrderServiceImpl implements UserOrderService {
 
                 }
 
+                //购买减库存。
+                if (productInfo != null) {
+                    ProductInfo updateProduct = new ProductInfo();
+
+                    updateProduct.setId(productInfo.getId());
+                    updateProduct.setInventory(productInfo.getInventory() - record.getQuantity());
+                    productInfoMapper.updateByPrimaryKeySelective(updateProduct);
+                }
+
+
                 if (updates > 0) {
                     return true;
                 }
@@ -628,6 +638,24 @@ public class UserOrderServiceImpl implements UserOrderService {
 
                     record.setStatusFlag(AppConstant.OrderStatus.CANCEL);
                     userOrderMapper.updateByPrimaryKeySelective(record);
+
+                    /**
+                     * 获取产品信息
+                     */
+                    ProductInfo productInfo = new ProductInfo();
+                    productInfo.setId(userOrder.getProductId());
+
+                    productInfo = productInfoMapper.queryProductInfo(productInfo);
+
+                    //取消加库存库存。
+                    if (productInfo != null) {
+                        ProductInfo updateProduct = new ProductInfo();
+
+                        updateProduct.setId(productInfo.getId());
+                        updateProduct.setInventory(productInfo.getInventory() + userOrder.getQuantity());
+                        productInfoMapper.updateByPrimaryKeySelective(updateProduct);
+                    }
+
                 }
 
 
@@ -671,6 +699,24 @@ public class UserOrderServiceImpl implements UserOrderService {
                     //结算商家
                     jieSuan(userOrder.getId() + "");
 
+                    /**
+                     * 获取产品信息
+                     */
+                    ProductInfo productInfo = new ProductInfo();
+                    productInfo.setId(userOrder.getProductId());
+
+                    productInfo = productInfoMapper.queryProductInfo(productInfo);
+
+                    //取消加库存库存。
+                    if (productInfo != null) {
+                        ProductInfo updateProduct = new ProductInfo();
+
+                        updateProduct.setId(productInfo.getId());
+                        updateProduct.setInventory(productInfo.getInventory() + userOrder.getQuantity());
+                        productInfoMapper.updateByPrimaryKeySelective(updateProduct);
+                    }
+
+
                 }
 
 

src/main/java/com/izouma/awesomeadmin/web/SystemConfigController.java

@@ -106,9 +106,9 @@ public class SystemConfigController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
-    public Result deleteSystemConfig(@RequestParam(required = true, value = "id") String id) {
+    public Result deleteSystemConfig(SystemConfig record) {
 
-        boolean num = systemConfigService.deleteSystemConfig(id);
+        boolean num = systemConfigService.deleteSystemConfig(record);
         if (num) {
         return new Result(true, "删除成功");
         }
@@ -132,10 +132,10 @@ public class SystemConfigController {
         String sheetName = "system_config";
         String titleName = "系统配置数据表";
         String fileName = "系统配置表";
-        int columnNumber = 10;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "订单比率" ,   "提现比率" ,   "预留字段" ,   "启用标识"  };
-        String[][] dataList = new String[systemConfigs.size()][10];
+        int columnNumber = 12;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "订单比率" ,   "提现比率" ,   "预留字段" ,   "启用标识" ,   "个人押金" ,   "企业押金"  };
+        String[][] dataList = new String[systemConfigs.size()][12];
 
         for (int i = 0; i < systemConfigs.size(); i++) {
 
@@ -149,6 +149,8 @@ public class SystemConfigController {
                         dataList[i][7] = String.valueOf(systemConfigs.get(i).getTixianRate());
                         dataList[i][8] = String.valueOf(systemConfigs.get(i).getExtra());
                         dataList[i][9] = String.valueOf(systemConfigs.get(i).getUseFlag());
+                        dataList[i][10] = String.valueOf(systemConfigs.get(i).getPersonalDeposit());
+                        dataList[i][11] = String.valueOf(systemConfigs.get(i).getCompanyDeposit());
                     }
 
 

src/main/vue/src/pages/SystemConfig.vue

@@ -7,6 +7,12 @@
             <el-form-item prop="tixianRate" label="提现比率">
                 <el-input v-model="formData.tixianRate" :disabled="'tixianRate'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="personalDeposit" label="个人押金">
+                <el-input v-model="formData.personalDeposit" ></el-input>
+            </el-form-item>
+            <el-form-item prop="companyDeposit" label="公司押金">
+                <el-input v-model="formData.companyDeposit" ></el-input>
+            </el-form-item>
             <el-form-item prop="extra" label="预留字段">
                 <el-input v-model="formData.extra" :disabled="'extra'==subColumn"></el-input>
             </el-form-item>