fix：修改数据库字段

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/model/PageDto.java

@@ -2,8 +2,6 @@ package edu.travel.model;
 
 import lombok.Data;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import java.io.Serializable;
 
 /**
@@ -20,10 +18,7 @@ public class PageDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 //    @NotNull(message = "当前页码不能为空")
-    @Min(value = 1, message = "最小值为1")
     private Integer pageNum = 1;
 //    @NotNull(message = "每页显示条数不能为空")
-    @Min(value = 1, message = "最小值为1")
-    @Max(value = 100, message = "最大值为100")
     private Integer pageSize = 10;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/constant/BaseConstant.java

@@ -0,0 +1,18 @@
+package edu.travel.commodity.constant;
+
+
+public class BaseConstant {
+    /**
+     * 删除标记 正常
+     */
+    public static final Integer BASIC_STATUS_NO_NUM = 0;
+    public static final String BASIC_STATUS_NO_STR = "0";
+
+    /**
+     * 删除标记 删除
+     */
+    public static final Integer BASIC_STATUS_YES_NUM = 1;
+    public static final String BASIC_STATUS_YES_STR = "1";
+
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/constant/RedisKey.java

@@ -0,0 +1,10 @@
+package edu.travel.commodity.constant;
+
+public interface RedisKey {
+    /**商品类型*/
+    String BASH = "shop";
+    /**商品类型*/
+   String PRODUCT_TYPE = BASH +"product:type";
+   /**热门商品类型*/
+   String PRODUCT_HOT_TYPE = BASH +"product:hot:type";
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/BannerDto.java

@@ -0,0 +1,9 @@
+package edu.travel.commodity.dto;
+
+import lombok.Data;
+
+@Data
+public class BannerDto extends BaseDto{
+    /**mode 0 首页轮播图*/
+    private String mode;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/BaseDto.java

@@ -0,0 +1,9 @@
+package edu.travel.commodity.dto;
+
+import lombok.Data;
+
+@Data
+public class BaseDto {
+    /**地区id*/
+    private String countryId;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/ShopTypeDto.java

@@ -0,0 +1,9 @@
+package edu.travel.commodity.dto;
+
+import lombok.Data;
+
+@Data
+public class ShopTypeDto extends BaseDto{
+    /**是否是热门类别 0 是 1 否*/
+    private String isHeat;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/BaseCountry.java

@@ -31,7 +31,6 @@ public class BaseCountry extends BaseEntity {
      */
     @TableField(value = "parent_id")
     private Long parentId;
-
     /**
      * 图片
      */
@@ -39,56 +38,42 @@ public class BaseCountry extends BaseEntity {
     private String imageUrl;
 
     /**
-     * 服务费比率
+     * 国家/洲中文名称
      */
-    @TableField(value = "service_charge_value")
-    private BigDecimal serviceChargeValue;
+    @TableField(value = "country_name_zh")
+    private String countryNameZh;
 
     /**
-     * 国家/洲名称
+     * 国家/洲英文名称
      */
-    @TableField(value = "country_name")
-    private String countryName;
+    @TableField(value = "country_name_en")
+    private String countryNameEn;
 
     /**
-     * 服务状态，默认0,-0未开通，-1开通
+     * 当地国家/洲名称
      */
-    @TableField(value = "serve_state")
-    private Integer serveState;
-
+    @TableField(value = "country_name_local")
+    private String countryNameLocal;
     /**
-     * 系统标识
+     * 国家图片
      */
-    @TableField(value = "project")
-    private String project;
-
+    @TableField(value = "country_img")
+    private Integer countryImg;
     /**
-     * 创建时间
+     * 国家区号
      */
-    @TableField(value = "create_time")
-    private Date createTime;
-
+    @TableField(value = "area_code")
+    private Integer areaCode;
     /**
-     * 创建人
+     * 经度
      */
-    @TableField(value = "create_user_id")
-    private String createUserId;
+    @TableField(value = "longitude")
+    private String longitude;
 
     /**
-     * 更新时间
+     * 维度
      */
-    @TableField(value = "update_time")
-    private Date updateTime;
+    @TableField(value = "latitude")
+    private String latitude;
 
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopAddress.java

@@ -73,39 +73,4 @@ public class ShopAddress extends BaseEntity {
     @TableField(value = "is_default")
     private Integer isDefault;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopBanner.java

@@ -46,7 +46,7 @@ public class ShopBanner extends BaseEntity {
      * 国家
      */
     @TableField(value = "country_id")
-    private String countryId;
+    private Long countryId;
 
     /**
      * 链接地址
@@ -90,39 +90,4 @@ public class ShopBanner extends BaseEntity {
     @TableField(value = "`enable`")
     private Integer enable;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopCategory.java

@@ -79,39 +79,4 @@ public class ShopCategory extends BaseEntity {
     @TableField(value = "`enable`")
     private Integer enable;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopComplaintPicture.java

@@ -37,39 +37,4 @@ public class ShopComplaintPicture extends BaseEntity {
     @TableField(value = "img_url")
     private String imgUrl;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopCountryCurrency.java

@@ -55,33 +55,4 @@ public class ShopCountryCurrency extends BaseEntity {
     @TableField(value = "currency_code")
     private String currencyCode;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopCountryPay.java

@@ -37,33 +37,4 @@ public class ShopCountryPay extends BaseEntity {
     @TableField(value = "pay_name")
     private String payName;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopCurrency.java

@@ -26,12 +26,6 @@ public class ShopCurrency extends BaseEntity {
     private Long id;
 
     /**
-     * 订单商品表id
-     */
-    @TableField(value = "order_item_id")
-    private Long orderItemId;
-
-    /**
      * 货币名称_en
      */
     @TableField(value = "currency_name_en")
@@ -44,44 +38,25 @@ public class ShopCurrency extends BaseEntity {
     private String currencyNameZh;
 
     /**
-     * 货币符号
+     * 货币代码
      */
     @TableField(value = "currency_code")
     private String currencyCode;
 
     /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
+     * 货币符号
+     * */
+    @TableField(value = "currency_symbol")
+    private String currencySymbol;
     /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
+     * 货币单位
+     * */
+    @TableField(value = "currency_unit")
+    private String currencyUnit;
 
     /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
+     * 状态 -0启用  -1禁用
+     * */
+    @TableField(value = "status")
+    private String status;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopFavorite.java

@@ -37,39 +37,4 @@ public class ShopFavorite extends BaseEntity {
     @TableField(value = "product_id")
     private Long productId;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopMgLabel.java

@@ -37,39 +37,5 @@ public class ShopMgLabel extends BaseEntity {
     @TableField(value = "img_url")
     private String imgUrl;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopOpinion.java

@@ -44,44 +44,10 @@ public class ShopOpinion extends BaseEntity {
     private String description;
 
     /**
-     * 创建人id
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
      * 意见处理,默认0,0未处理,1已处理
      */
     @TableField(value = "`state`")
     private Integer state;
 
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 
-    /**
-     * 项目
-     */
-    @TableField(value = "project")
-    private String project;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopOpinionType.java

@@ -31,17 +31,7 @@ public class ShopOpinionType extends BaseEntity {
     @TableField(value = "type_name")
     private String typeName;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
 
     /**
      * 其他类型（用户填写）
@@ -49,27 +39,5 @@ public class ShopOpinionType extends BaseEntity {
     @TableField(value = "other_type")
     private String otherType;
 
-    /**
-     * 创建人id
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
 
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
-
-    /**
-     * 项目
-     */
-    @TableField(value = "project")
-    private String project;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopParameters.java

@@ -43,39 +43,5 @@ public class ShopParameters extends BaseEntity {
     @TableField(value = "is_necessary")
     private Integer isNecessary;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopPay.java

@@ -31,33 +31,5 @@ public class ShopPay extends BaseEntity {
     @TableField(value = "pay_name")
     private String payName;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
 
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopProduct.java

@@ -80,41 +80,6 @@ public class ShopProduct extends BaseEntity {
     @TableField(value = "default_price")
     private BigDecimal defaultPrice;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 
     /**
      * 0 上架 1 下架

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopProductImage.java

@@ -55,39 +55,5 @@ public class ShopProductImage extends BaseEntity {
     @TableField(value = "sort_order")
     private Integer sortOrder;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopProductParameters.java

@@ -43,39 +43,5 @@ public class ShopProductParameters extends BaseEntity {
     @TableField(value = "parameters_value")
     private String parametersValue;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopProductSku.java

@@ -68,39 +68,5 @@ public class ShopProductSku extends BaseEntity {
     @TableField(value = "price")
     private BigDecimal price;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopProductSpec.java

@@ -37,39 +37,5 @@ public class ShopProductSpec extends BaseEntity {
     @TableField(value = "spec_name")
     private String specName;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopReview.java

@@ -61,39 +61,5 @@ public class ShopReview extends BaseEntity {
     @TableField(value = "content")
     private String content;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopSearchRecords.java

@@ -55,39 +55,5 @@ public class ShopSearchRecords extends BaseEntity {
     @TableField(value = "search_time")
     private Date searchTime;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopServiceCharge.java

@@ -38,39 +38,5 @@ public class ShopServiceCharge extends BaseEntity {
     @TableField(value = "country")
     private Long country;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopShoppingCart.java

@@ -43,39 +43,5 @@ public class ShopShoppingCart extends BaseEntity {
     @TableField(value = "quantity")
     private Integer quantity;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopSkuSpecValue.java

@@ -37,39 +37,5 @@ public class ShopSkuSpecValue extends BaseEntity {
     @TableField(value = "spec_value_id")
     private Long specValueId;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopSpec.java

@@ -31,39 +31,5 @@ public class ShopSpec extends BaseEntity {
     @TableField(value = "spec_name")
     private String specName;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
 
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopSpecValue.java

@@ -37,39 +37,4 @@ public class ShopSpecValue extends BaseEntity {
     @TableField(value = "spec_value")
     private String specValue;
 
-    /**
-     * 系统标识
-     */
-    @TableField(value = "project")
-    private String project;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user_id")
-    private String createUserId;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_user_id")
-    private String updateUserId;
-
-    /**
-     * 删除标记 0正常 1删除
-     */
-    @TableField(value = "delete_flag")
-    private Integer deleteFlag;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopBannerService.java

@@ -1,8 +1,14 @@
 package edu.travel.commodity.service;
 
+import edu.travel.commodity.dto.BannerDto;
 import edu.travel.commodity.entity.ShopBanner;
 import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.commodity.vo.BannerVo;
+
+import java.util.List;
+
 public interface ShopBannerService extends IService<ShopBanner>{
 
 
+    List<BannerVo> getBanner(BannerDto mode);
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopCategoryService.java

@@ -1,8 +1,14 @@
 package edu.travel.commodity.service;
 
+import edu.travel.commodity.dto.ShopTypeDto;
 import edu.travel.commodity.entity.ShopCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.commodity.vo.ShopTypeVo;
+
+import java.util.List;
+
 public interface ShopCategoryService extends IService<ShopCategory>{
 
+    List<ShopTypeVo> getShopType(ShopTypeDto param);
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopBannerServiceImpl.java

@@ -1,12 +1,41 @@
 package edu.travel.commodity.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.commodity.dto.BannerDto;
 import edu.travel.commodity.entity.ShopBanner;
 import edu.travel.commodity.mapper.ShopBannerMapper;
 import edu.travel.commodity.service.ShopBannerService;
+import edu.travel.commodity.vo.BannerVo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.springframework.security.oauth2.common.AuthenticationScheme.query;
+
 @Service
 public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBanner> implements ShopBannerService {
 
+    @Override
+    public List<BannerVo> getBanner(BannerDto mode) {
+       List<BannerVo> list = new ArrayList<>();
+        if(ObjectUtil.isEmpty(mode.getMode()))return list;
+        LambdaQueryWrapper<ShopBanner> query = Wrappers.lambdaQuery();
+
+        query.eq(ShopBanner::getMode,mode.getMode()).eq(ShopBanner::getEnable,1).eq(ShopBanner::getCountryId,mode.getCountryId())
+                .and(
+                item->item.le(ShopBanner::getEndTime,new Date()).or().eq(ShopBanner::getIsDefault,1)
+        );
+        query.orderByDesc(ShopBanner::getSortOrder);
+        List<ShopBanner> ls = list(query);
+        if(!ls.isEmpty()){
+            list= BeanUtil.copyToList(ls,BannerVo.class);
+        }
+        return list;
+    }
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopCategoryServiceImpl.java

@@ -1,13 +1,77 @@
-package edu.travel.commodity.serviceImpl;
+package edu.travel.commodity.service.impl;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.commodity.constant.BaseConstant;
+import edu.travel.commodity.constant.RedisKey;
+import edu.travel.commodity.dto.ShopTypeDto;
 import edu.travel.commodity.entity.ShopCategory;
 import edu.travel.commodity.mapper.ShopCategoryMapper;
 import edu.travel.commodity.service.ShopCategoryService;
+import edu.travel.commodity.utils.RedisUtil;
+import edu.travel.commodity.vo.ShopTypeVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 @Service
 public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, ShopCategory> implements ShopCategoryService {
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Override
+    public List<ShopTypeVo> getShopType(ShopTypeDto shopTypeDto) {
+        String redisKey="";
+        if(shopTypeDto.getIsHeat().equals(BaseConstant.BASIC_STATUS_NO_STR)){
+            redisKey=RedisKey.PRODUCT_HOT_TYPE;
+        }else {
+            redisKey=RedisKey.PRODUCT_TYPE;
+        }
+        String string = redisUtil.getString(redisKey);
+        if(!ObjectUtil.isEmpty(string)){
+            JSONArray objects = JSONUtil.parseArray(string);
+            return JSONUtil.toList(objects, ShopTypeVo.class);
+        }
+        LambdaQueryWrapper<ShopCategory> query = Wrappers.lambdaQuery();
+        //条件构建
+        query.eq(ShopCategory::getCountry, shopTypeDto.getCountryId());
 
+        if(shopTypeDto.getIsHeat().equals(BaseConstant.BASIC_STATUS_NO_STR)){
+            query.orderByDesc(ShopCategory::getHeatValue);
+        }else {
+            query.orderByDesc(ShopCategory::getSortOrder);
+        }
+        List<ShopCategory> list = list(query);
+        if(list.isEmpty()){
+            return new ArrayList<>();
+        }
+        //父级
+        List<ShopCategory> collect = list.stream().filter(item -> item.getParentId().equals(0L)).collect(Collectors.toList());
+        if(collect.isEmpty()){
+            return new ArrayList<>();
+        }
+        List<ShopTypeVo> parent = BeanUtil.copyToList(collect, ShopTypeVo.class);
+        for (ShopTypeVo shopCategory : parent) {
+            List<ShopCategory> children = list.stream().filter(item -> item.getParentId().toString().equals(shopCategory.getId())).collect(Collectors.toList());
+            List<ShopTypeVo> shopTypeVos = BeanUtil.copyToList(children, ShopTypeVo.class);
+            shopCategory.setChildren(shopTypeVos);
+        }
+        if(shopTypeDto.getIsHeat().equals(BaseConstant.BASIC_STATUS_NO_STR)){
+            //24小时热门过期
+            redisUtil.setString(RedisKey.PRODUCT_TYPE,JSONUtil.toJsonStr(parent),24*60*60*60, TimeUnit.SECONDS);
+        }else {
+            redisUtil.setString(RedisKey.PRODUCT_TYPE,JSONUtil.toJsonStr(parent));
+        }
+        return parent;
+    }
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/utils/RedisUtil.java

@@ -0,0 +1,36 @@
+package edu.travel.commodity.utils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class RedisUtil {
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+    /**
+     *通过KEY 获取值
+     */
+    public String getString(String key) {
+        return stringRedisTemplate.opsForValue().get(key);
+    }
+    /**
+     * 设置KEY 和 VALUE
+     */
+    public void setString(String key, String value) {
+        stringRedisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * @param key KEY
+     * @param value 值
+     * @param expire 过期时间
+     * @param timeUnit 时间单位
+     */
+    public void setString(String key, String value,long expire,TimeUnit timeUnit) {
+        stringRedisTemplate.opsForValue().set(key, value,expire, timeUnit);
+    }
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/vo/BannerVo.java

@@ -0,0 +1,8 @@
+package edu.travel.commodity.vo;
+
+import lombok.Data;
+
+@Data
+public class BannerVo {
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/vo/ShopTypeVo.java

@@ -0,0 +1,39 @@
+package edu.travel.commodity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ShopTypeVo {
+    /**id*/
+    private String id;
+    /**
+     * 分类图标/封面图
+     */
+    private String imageUrl;
+
+    /***/
+    /**
+     * 国家ID
+     */
+    private String country;
+
+    /**
+     * 热度值
+     */
+    private Integer heatValue;
+
+    /**
+     * 仓库ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 分类名称
+     */
+    private String typeName;
+
+    /**子类别*/
+    private List<ShopTypeVo> children;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopBannerController.java

@@ -1,18 +1,27 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.dto.BannerDto;
+import edu.travel.commodity.dto.ShopTypeDto;
+import edu.travel.commodity.entity.ShopCategory;
 import edu.travel.commodity.service.ShopBannerService;
+import edu.travel.commodity.vo.BannerVo;
+import edu.travel.commodity.vo.ShopTypeVo;
+import edu.travel.resp.BaseResponse;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
 * 轮播图(shop_banner)表控制层
 *
 * @author xxxxx
 */
 @RestController
-@RequestMapping("/shop_banner")
-public class ShopBannerController {
+@RequestMapping("/shopBanner")
+public class ShopBannerController extends BaseController<ShopCategory> {
 /**
 * 服务对象
 */
@@ -20,5 +29,16 @@ public class ShopBannerController {
     private ShopBannerService shopBannerService;
 
 
+    /**
+     *  获取轮播图
+     * @param banner
+     * @return {@link BaseResponse }<{@link List }<{@link BannerVo }>>
+     */
+    @GetMapping("/getBanner")
+    public BaseResponse<List<BannerVo>> getBanner(BannerDto banner){
+        return new BaseResponse<>(200,"success",shopBannerService.getBanner(banner));
+    }
+
+
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopCategoryController.java

@@ -1,23 +1,42 @@
 package edu.travel.commodity.web;
 
+import cn.hutool.core.bean.BeanUtil;
+import edu.travel.commodity.dto.ShopTypeDto;
+import edu.travel.commodity.entity.ShopCategory;
 import edu.travel.commodity.service.ShopCategoryService;
+import edu.travel.commodity.vo.ShopTypeVo;
+import edu.travel.remote.feign.mode.vo.tenant.AddMenuVo;
+import edu.travel.remote.feign.mode.vo.tenant.SysRoleVo;
+import edu.travel.resp.BaseResponse;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
 * 商品类型(shop_category)表控制层
 *
 * @author xxxxx
 */
 @RestController
-@RequestMapping("/shop_category")
-public class ShopCategoryController {
+@RequestMapping("/shopCategory")
+public class ShopCategoryController  extends BaseController<ShopCategory> {
 /**
 * 服务对象
 */
     @Autowired
     private ShopCategoryService shopCategoryService;
 
+    /**
+     *  获取商品类型
+     * @return {@link BaseResponse }<{@link AddMenuVo }>
+     */
+    @GetMapping("getShopType")
+    public BaseResponse<List<ShopTypeVo>> getShopType(ShopTypeDto param){
+        return new BaseResponse<>(200,"success",shopCategoryService.getShopType(param));
+    }
+
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopProductController.java

@@ -1,6 +1,8 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopProduct;
 import edu.travel.commodity.service.ShopProductService;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shop_product")
-public class ShopProductController {
+public class ShopProductController extends BaseController<ShopProduct> {
 /**
 * 服务对象
 */

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopProductImageController.java

@@ -1,6 +1,8 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopProductImage;
 import edu.travel.commodity.service.ShopProductImageService;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shop_product_image")
-public class ShopProductImageController {
+public class ShopProductImageController extends BaseController<ShopProductImage> {
 /**
 * 服务对象
 */

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopProductParametersController.java

@@ -1,6 +1,8 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopProductParameters;
 import edu.travel.commodity.service.ShopProductParametersService;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shop_product_parameters")
-public class ShopProductParametersController {
+public class ShopProductParametersController  extends BaseController<ShopProductParameters> {
 /**
 * 服务对象
 */

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopProductSkuController.java

@@ -1,6 +1,8 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopProductSku;
 import edu.travel.commodity.service.ShopProductSkuService;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shop_product_sku")
-public class ShopProductSkuController {
+public class ShopProductSkuController extends BaseController<ShopProductSku> {
 /**
 * 服务对象
 */

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopProductSpecController.java

@@ -1,6 +1,8 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopProductSpec;
 import edu.travel.commodity.service.ShopProductSpecService;
+import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shop_product_spec")
-public class ShopProductSpecController {
+public class ShopProductSpecController extends BaseController<ShopProductSpec> {
 /**
 * 服务对象
 */

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/BaseCountryMapper.xml

@@ -7,9 +7,13 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <result column="image_url" jdbcType="VARCHAR" property="imageUrl" />
-    <result column="service_charge_value" jdbcType="DECIMAL" property="serviceChargeValue" />
-    <result column="country_name" jdbcType="VARCHAR" property="countryName" />
-    <result column="serve_state" jdbcType="INTEGER" property="serveState" />
+    <result column="country_name_zh" jdbcType="DECIMAL" property="countryNameZh" />
+    <result column="country_name_eh" jdbcType="VARCHAR" property="countryNameEn" />
+    <result column="country_name_local" jdbcType="INTEGER" property="countryNameLocal" />
+    <result column="country_img" jdbcType="INTEGER" property="countryImg" />
+    <result column="area_code" jdbcType="INTEGER" property="areaCode" />
+    <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+    <result column="latitude" jdbcType="VARCHAR" property="latitude" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
@@ -19,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, parent_id, image_url, service_charge_value, country_name, serve_state, project, 
+    id, parent_id, image_url, service_charge_value, country_name, serve_state, project, longitude,latitude
     create_time, create_user_id, update_time, update_user_id, delete_flag
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopBannerMapper.xml

@@ -12,7 +12,7 @@
     <result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
-    <result column="country_id" jdbcType="TIMESTAMP" property="countryId" />
+    <result column="country_id" jdbcType="BIGINT" property="countryId" />
     <result column="is_default" jdbcType="INTEGER" property="isDefault" />
     <result column="mode" jdbcType="INTEGER" property="mode" />
     <result column="enable" jdbcType="INTEGER" property="enable" />
@@ -25,7 +25,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, url, url_type, content, link_url, sort_order, start_time, end_time, `default`, `country_id`
+    id, url, url_type, content, link_url, sort_order, start_time, end_time, `is_default`, `country_id`
     `mode`, `enable`, project, create_time, create_user_id, update_time, update_user_id, 
     delete_flag
   </sql>

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopCurrencyMapper.xml

@@ -5,10 +5,12 @@
     <!--@mbg.generated-->
     <!--@Table shop_currency-->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_item_id" jdbcType="BIGINT" property="orderItemId" />
     <result column="currency_name_en" jdbcType="VARCHAR" property="currencyNameEn" />
     <result column="currency_name_zh" jdbcType="VARCHAR" property="currencyNameZh" />
     <result column="currency_code" jdbcType="VARCHAR" property="currencyCode" />
+    <result column="currency_symbol" jdbcType="VARCHAR" property="currencySymbol" />
+    <result column="currency_unit" jdbcType="VARCHAR" property="currencyUnit" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
@@ -18,7 +20,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, order_item_id, currency_name_en, currency_name_zh, currency_code, project, create_time, 
+    id, currency_name_en, currency_name_zh, currency_code, project, create_time, `currency_symbol`,`status`
     create_user_id, update_time, update_user_id, delete_flag
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-order/src/main/java/edu/travel/order/entity/ShopOrder.java

@@ -95,8 +95,8 @@ public class ShopOrder extends BaseEntity {
     /**
      * 货币
      */
-    @TableField(value = "currency")
-    private String currency;
+    @TableField(value = "currency_id")
+    private Long currencyId;
 
     /**
      * 汇率

edu-travel-service/edu-travel-service-order/src/main/resources/mapper/ShopOrderMapper.xml

@@ -16,7 +16,7 @@
     <result column="address_id" jdbcType="BIGINT" property="addressId" />
     <result column="order_number" jdbcType="VARCHAR" property="orderNumber" />
     <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
-    <result column="currency" jdbcType="VARCHAR" property="currency" />
+    <result column="currency" jdbcType="VARCHAR" property="currencyId" />
     <result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />