店铺运费设置修改

kangtian
1 parent c60bcbd2
Showing 6 changed files with 123 additions and 12 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/constant/Constant.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ShopExpressCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/impl/ShopExpressSettingServiceImpl.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/type/ExpressCondition.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/type/ExpressType.java
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ShopExpressSettingDao.xml
@@ -79,4 +79,9 @@ public interface Constant {
      * 库存配置百分比默认值
      */
     BigDecimal STOCK_CONFIG_JMSF_DEFAULT = BigDecimal.valueOf(100.00);
+
+    /**
+     * 店铺包邮时间间隔 /小时
+     */
+    Integer SHOP_EXPRESS_FREE_TIME_PERIOD = 24;
 }
@@ -2,6 +2,8 @@ package com.diligrp.etrade.shop.domain.request;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.shop.model.ShopExpressSetting;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
@@ -26,10 +28,12 @@ public class ShopExpressCo implements Serializable {
     /**
      * 配送方式
      */
+    @Size(min = 1, message = "至少选择一种配送方式！")
     private List<Integer> type;
     /**
      * 固定运费
      */
+    @NotNull(message = "fee should not be null")
     private BigDecimal fee;
     /**
      * 包邮条件
 package com.diligrp.etrade.shop.service.impl;
+import com.diligrp.etrade.shop.constant.Constant;
 import com.diligrp.etrade.shop.dao.ShopExpressSettingDao;
 import com.diligrp.etrade.shop.domain.request.ShopExpressCo;
 import com.diligrp.etrade.shop.domain.request.ShopExpressQueryCo;
@@ -33,7 +34,7 @@ public class ShopExpressSettingServiceImpl implements ShopExpressSettingService 
         ShopExpressVo shopExpressVo = shopExpressSettingDao.selectByShopId(shopExpressCo.getShopId());
         if (shopExpressVo == null) {
             ShopExpressSetting shopExpressSetting = shopExpressCo.toShopExpressSetting();
-            shopExpressSetting.setPeriod(24);
+            shopExpressSetting.setPeriod(Constant.SHOP_EXPRESS_FREE_TIME_PERIOD);
             int insert = shopExpressSettingDao.insert(shopExpressSetting);
             return insert > 0;
         } else {
+package com.diligrp.etrade.shop.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public enum ExpressCondition implements IEnumType {
+
+
+    MONEY("满金额包邮", 1),
+    LOGIC("满逻辑包邮", 2),
+
+    ;
+    private final String name;
+    private final int code;
+
+    private ExpressCondition(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static Optional<ExpressCondition> get(int code) {
+        Stream<ExpressCondition> stream = Arrays.stream(values());
+        return stream.filter((gender) -> {
+            return gender.getCode() == code;
+        }).findFirst();
+    }
+
+    public static String getName(int code) {
+        Stream<ExpressCondition> stream = Arrays.stream(values());
+        Optional<String> result = stream.filter((gender) -> {
+            return gender.getCode() == code;
+        }).map(ExpressCondition::getName).findFirst();
+        return result.isPresent() ? (String) result.get() : null;
+    }
+
+    public static List<ExpressCondition> getList() {
+        return Arrays.asList(values());
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
+package com.diligrp.etrade.shop.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public enum ExpressType implements IEnumType {
+
+
+    PICK_UP("到店自提", 1),
+    DELIVERY("物流配送", 2),
+
+    ;
+    private final String name;
+    private final int code;
+
+    private ExpressType(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static Optional<ExpressType> get(int code) {
+        Stream<ExpressType> stream = Arrays.stream(values());
+        return stream.filter((gender) -> {
+            return gender.getCode() == code;
+        }).findFirst();
+    }
+
+    public static String getName(int code) {
+        Stream<ExpressType> stream = Arrays.stream(values());
+        Optional<String> result = stream.filter((gender) -> {
+            return gender.getCode() == code;
+        }).map(ExpressType::getName).findFirst();
+        return result.isPresent() ? (String) result.get() : null;
+    }
+
+    public static List<ExpressType> getList() {
+        return Arrays.asList(values());
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
@@ -44,11 +44,8 @@
   <update id="update" parameterType="com.diligrp.etrade.shop.model.ShopExpressSetting">
     update shop_express_setting
     <set>
-      <if test="shopId != null">
-        shop_id = #{shopId,jdbcType=BIGINT},
-      </if>
       <if test="type != null">
-        `type` = #{type,jdbcType=TINYINT},
+        `type` = #{type,jdbcType=OTHER},
       </if>
       <if test="fee != null">
         fee = #{fee,jdbcType=DECIMAL},
@@ -65,12 +62,6 @@
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
-      <if test="creater != null">
-        creater = #{creater,jdbcType=VARCHAR},
-      </if>
-      <if test="createrId != null">
-        creater_id = #{createrId,jdbcType=BIGINT},
-      </if>
       <if test="modifier != null">
         modifier = #{modifier,jdbcType=VARCHAR},
       </if>
@@ -78,7 +69,7 @@
         modifier_id = #{modifierId,jdbcType=BIGINT},
       </if>
     </set>
-    where id = #{id,jdbcType=BIGINT}
+    where shop_id = #{shopId,jdbcType=BIGINT}
   </update>
 </mapper>
 \ No newline at end of file