Ver código fonte

运费计算封装

xdd 2 meses atrás
pai
commit
e000036c9a

+ 6 - 67
fs-service-system/src/main/java/com/fs/store/domain/FsShippingTemplatesFree.java

@@ -3,15 +3,19 @@ package com.fs.store.domain;
 import java.math.BigDecimal;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
-import lombok.Builder;
+import lombok.*;
 
+@EqualsAndHashCode(callSuper = true)
 @Builder
 /**
  * 免邮费对象 fs_shipping_templates_free
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class FsShippingTemplatesFree extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -43,69 +47,4 @@ public class FsShippingTemplatesFree extends BaseEntity
     @Excel(name = "计费方式")
     private Integer type;
 
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTempId(Long tempId) 
-    {
-        this.tempId = tempId;
-    }
-
-    public Long getTempId() 
-    {
-        return tempId;
-    }
-    public void setProvinceId(Long provinceId) 
-    {
-        this.provinceId = provinceId;
-    }
-
-    public Long getProvinceId() 
-    {
-        return provinceId;
-    }
-    public void setCityId(Long cityId) 
-    {
-        this.cityId = cityId;
-    }
-
-    public Long getCityId() 
-    {
-        return cityId;
-    }
-    public void setNumber(BigDecimal number) 
-    {
-        this.number = number;
-    }
-
-    public BigDecimal getNumber() 
-    {
-        return number;
-    }
-    public void setPrice(BigDecimal price) 
-    {
-        this.price = price;
-    }
-
-    public BigDecimal getPrice() 
-    {
-        return price;
-    }
-    public void setType(Integer type) 
-    {
-        this.type = type;
-    }
-
-    public Integer getType() 
-    {
-        return type;
-    }
-
 }

+ 2 - 2
fs-service-system/src/main/java/com/fs/store/strategy/ShippingTemplateManager.java

@@ -81,7 +81,7 @@ public class ShippingTemplateManager {
             }
 
 
-            log.info("模板加载完成: {}", shippingTemplate);
+            log.info("模板加载区域完成: {}", fsShippingTemplatesRegions.size());
 
             log.info("正在加载模板包邮规则");
             List<FsShippingTemplatesFree> freeShippingRules = fsShippingTemplatesFreeService.selectFreeShippingRuleByTempId(template.getId());
@@ -102,7 +102,7 @@ public class ShippingTemplateManager {
 
                 shippingTemplate.addFreeShippingRule(rule);
             }
-            log.info("模板包邮规则加载完成: {}", shippingTemplate);
+            log.info("模板包邮规则加载完成: {} 个", freeShippingRules);
 
             this.addTemplate(shippingTemplate);
         }