Merge remote-tracking branch 'origin/main'

# Conflicts:
#	edu-travel-common/edu-travel-common-openfeign/pom.xml

edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/CountryAdapter.java

@@ -0,0 +1,46 @@
+package edu.travel.adapter.service.country;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.dto.BaseCountryServeDto;
+import edu.travel.remote.BaseCountryServeRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.BaseCountryServeVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CountryAdapter  {
+    @Autowired
+    private BaseCountryServeRemoteController baseCountryServeRemoteController;
+    @AdapterAnnotation
+    public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree() {
+      return   baseCountryServeRemoteController.getCountryServeTree();
+    }
+
+    @AdapterAnnotation
+    public RPCBaseResponse<BaseCountryServeVo> getFormId(String id) {
+        return baseCountryServeRemoteController.getFormId(id);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(BaseCountryServeDto entity) {
+        return baseCountryServeRemoteController.updateTargetFormId(entity);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(BaseCountryServeDto entity) {
+        return baseCountryServeRemoteController.saveFormTarget(entity);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(List<String> ids) {
+        return baseCountryServeRemoteController.deleteTargetFormId(ids);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm() {
+        return baseCountryServeRemoteController.getAllForm();
+    }
+}

edu-travel-adapter/edu-travel-adapter-order/pom.xml

@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-adapter</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-adapter-order</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-adapter-order</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-order</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-adapter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

edu-travel-adapter/edu-travel-adapter-order/src/main/java/edu/travel/adapter/service/order/OrderItemAdapter.java

@@ -0,0 +1,20 @@
+package edu.travel.adapter.service.order;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.remote.dto.GetOrderItemDto;
+import edu.travel.remote.order.ShopOrderItemRemoteController;
+import edu.travel.remote.vo.OrderItemVo;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderItemAdapter {
+    @Autowired
+    private ShopOrderItemRemoteController shopOrderItemRemoteController;
+
+    @AdapterAnnotation
+    public RPCBaseResponse<OrderItemVo> getOrderItemVo(GetOrderItemDto params) {
+        return shopOrderItemRemoteController.getOrderItemVo(params);
+    }
+}

edu-travel-adapter/edu-travel-adapter-tenant/src/main/java/edu/travel/adapter/service/tenant/SysRoleAdapter.java

@@ -0,0 +1,21 @@
+package edu.travel.adapter.service.tenant;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.remote.feign.mode.vo.tenant.SysRoleVo;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.tenant.SysRoleRemoteController;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+@Component
+public class SysRoleAdapter {
+    @Resource
+    private SysRoleRemoteController sysRoleRemoteController;
+    /**
+     * 通过id查找角色
+     */
+    @AdapterAnnotation
+    public RPCBaseResponse<SysRoleVo> getFormId(String id){
+        return sysRoleRemoteController.getFormId(id);
+    };
+}

edu-travel-adapter/edu-travel-adapter-tenant/src/main/java/edu/travel/adapter/service/tenant/TenantAdapter.java

@@ -2,9 +2,12 @@ package edu.travel.adapter.service.tenant;
 
 import edu.travel.adapter.annotation.AdapterAnnotation;
 import edu.travel.remote.feign.mode.vo.tenant.EduTenantVo;
+import edu.travel.remote.feign.mode.vo.tenant.SysRoleVo;
+import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.tenant.TenantRemoteController;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -19,7 +22,16 @@ public class TenantAdapter {
     public RPCBaseResponse<EduTenantVo> getTenantById(Long id) {
         return tenantRemoteController.getTenantById(id);
     }
-
+    /**
+     * 根据用户id获取用户角色列表(未分页)
+     */
+    @AdapterAnnotation
+    public BaseResponse<List<SysRoleVo>> getRoleListByUserId(){
+        return tenantRemoteController.getRoleListByUserId();
+    };
+    /**
+     * 通过id查询商城用户信息
+     */
     @AdapterAnnotation
     public RPCBaseResponse<List<EduTenantVo>> getTenantByIds(Set<String> id) {
         return tenantRemoteController.getTenantByIds(id);

edu-travel-adapter/pom.xml

@@ -15,6 +15,7 @@
     <modules>
         <module>edu-travel-adapter-upload</module>
         <module>edu-travel-adapter-tenant</module>
+        <module>edu-travel-adapter-order</module>
     </modules>
 
     <properties>

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/MyTreeUtil.java

@@ -6,8 +6,6 @@ import java.util.stream.Collectors;
 /**
  * 树形菜单构建工具
  *
- * @author Zee
- * @date 2023/7/20 0020 9:48
  */
 public class MyTreeUtil {
     /**

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/TreeNode.java

@@ -8,8 +8,6 @@ import java.util.Objects;
 /**
  * 树结点
  *
- * @author Zee
- * @date 2023/7/20 0020 9:45
  */
 public abstract class TreeNode {
     /**

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/FieldMetaObjectHandler.java

@@ -31,12 +31,18 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null) return;
         Object principal = authentication.getPrincipal();
-        String jsonString = JSON.toJSONString(principal);
-        JSONObject jsonObject = JSON.parseObject(jsonString);
+        Long userId = null;
+
+        if (!(principal instanceof String && "anonymousUser".equals(principal))) {
+            //走登录用户
+            String jsonString = JSON.toJSONString(principal);
+            JSONObject jsonObject = JSON.parseObject(jsonString);
+            userId = jsonObject.getLong("id");
+        }
+
         if (metaObject.hasSetter(CREATE_USER_ID)) {
-            this.strictInsertFill(metaObject, CREATE_USER_ID, String.class, jsonObject.getLong("id").toString());
+            this.strictInsertFill(metaObject, CREATE_USER_ID, String.class, userId != null ? userId.toString() : "");
         }
         if (metaObject.hasSetter(CREATE_TIME)) {
             this.strictInsertFill(metaObject, CREATE_TIME, Date.class, new Date());

edu-travel-common/edu-travel-common-resp/src/main/java/edu/travel/rpc/RPCBaseResponse.java

@@ -14,7 +14,8 @@ public class RPCBaseResponse<T> implements Serializable {
     private String msg;
     private T data;
 
-
+    public <T> RPCBaseResponse(int i, String message, T data, int total, int currentPage, int pageSize) {
+    }
     public static <T> RPCBaseResponse<T> success(T data) {
         return new RPCBaseResponse<>(200, "success", data);
     }

edu-travel-common/edu-travel-common-resp/src/main/java/edu/travel/rpc/RPCPageResponse.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -11,4 +13,21 @@ public class RPCPageResponse<T> extends RPCBaseResponse<T> {
     private int total;
     private int  currentPage;
     private int pageSize;
+
+    public <T> RPCPageResponse(int i, String message, T data, int total, int currentPage, int pageSize) {
+    }
+
+    public static <T> RPCBaseResponse<T> success(T data) {
+        return null;
+    }
+    public static <T> RPCBaseResponse<T> success() {
+        return new RPCBaseResponse<>(200, "success",null);
+    }
+    public static <T> RPCBaseResponse<T> success(String message) {
+        return new RPCBaseResponse<>(200, message, null);
+    }
+    public static <T> RPCPageResponse<T> success(String message,T data,int total,int currentPage,int pageSize) {
+        return new RPCPageResponse<>(200, message, data,total,currentPage,pageSize);
+    }
+
 }

edu-travel-remote/edu-travel-remote-base/src/main/java/edu/travel/remote/base/RemoteBaseController.java

@@ -4,12 +4,13 @@ import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 public interface RemoteBaseController<V,D> {
     @GetMapping("/getFormId")
-    public RPCBaseResponse<V> getFormId(String id);
+    public RPCBaseResponse<V> getFormId(@RequestParam("id") String id);
     @PostMapping("/updateFormId")
     public RPCBaseResponse<V> updateTargetFormId(@RequestBody D entity);
     @PostMapping("/saveForm")

edu-travel-remote/edu-travel-remote-commodity/pom.xml

@@ -66,5 +66,6 @@
             <artifactId>edu-travel-remote-tenant</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
     </dependencies>
 </project>

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/AddReviewDto.java

@@ -0,0 +1,45 @@
+package edu.travel.remote.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 类功能描述：
+ *  新增评论
+ * @author 大春
+ * @date 2025/03/04
+ */
+
+@Data
+public class AddReviewDto {
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     *  评论内容
+     */
+    private String content;
+
+    /**
+     * 评论图片
+     */
+    private List<String> image;
+
+    /**
+     * 商品ID
+     */
+    private String productId;
+
+    /**
+     * sku
+     */
+    private String skuId;
+
+    /**
+     * 评级1-5
+     */
+    private Integer rating;
+}

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/AddShopCartDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/AddShopCartDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/BaseDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/BaseDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import edu.travel.po.PagePO;
 import lombok.Data;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/GetProductByTypeDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/GetProductByTypeDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/ProductSpecDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/ProductSpecDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/SearchProductDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/SearchProductDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/SearchRecordListDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/SearchRecordListDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/ShopTypeDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/ShopTypeDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/dto/UpdateAddressDto.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/UpdateAddressDto.java

@@ -1,4 +1,4 @@
-package edu.travel.dto;
+package edu.travel.remote.dto;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ProductImageVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ProductImageVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ProductSkuVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ProductSkuVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ProductSpecVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ProductSpecVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/SearchRecordsVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/SearchRecordsVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopAddressVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopAddressVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 
@@ -9,7 +9,6 @@ public class ShopAddressVo {
      */
     private String id;
 
-
     /**
      * 国家id
      */

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopCartListVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopCartListVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopFavoriteVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopFavoriteVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopParametersVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopParametersVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopProductVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopProductVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 
 import lombok.Data;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopReviewVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopReviewVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import edu.travel.remote.feign.mode.vo.tenant.EduTenantVo;
 import lombok.Data;
@@ -42,7 +42,7 @@ public class ShopReviewVo {
     /**
      * sku详情
      */
-    private SpecOneVo specOneVo;
+    private List<SpecOneVo> specOneVo;
 
     /**
      * 评级

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopSkuSpecValueVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopSkuSpecValueVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/ShopTypeVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopTypeVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/SpecOneVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/SpecOneVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 
@@ -11,14 +11,10 @@ import lombok.Data;
 
 @Data
 public class SpecOneVo {
-    /**
-     *
-     */
-    private String id;
 
-    private String specName;
+    private String specId;
 
-    private Integer sortOrder;
+    private String specName;
 
     private String specValue;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/SpecSortVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/SpecSortVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/SpecValueSortVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/SpecValueSortVo.java

@@ -1,4 +1,4 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/vo/SpecValueVo.java → edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/SpecValueVo.java

@@ -1,10 +1,10 @@
-package edu.travel.vo;
+package edu.travel.remote.vo;
 
 import lombok.Data;
 
 /**
  * 类功能描述：
- *      购物车商品规格值
+ *     购物车商品规格值
  * @author 大春
  * @date 2025/02/28
  */

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/entity/ShopCurrency.java

@@ -1,60 +0,0 @@
-package edu.travel.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 lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 货币表
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "shop_currency")
-public class ShopCurrency extends BaseEntity {
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 货币名称_en
-     */
-    @TableField(value = "currency_name_en")
-    private String currencyNameEn;
-
-    /**
-     * 货币名称_zh
-     */
-    @TableField(value = "currency_name_zh")
-    private String currencyNameZh;
-
-    /**
-     * 货币代码
-     */
-    @TableField(value = "currency_code")
-    private String currencyCode;
-
-    /**
-     * 货币符号
-     * */
-    @TableField(value = "currency_symbol")
-    private String currencySymbol;
-    /**
-     * 货币单位
-     * */
-    @TableField(value = "currency_unit")
-    private String currencyUnit;
-
-    /**
-     * 状态 -0启用  -1禁用
-     * */
-    @TableField(value = "status")
-    private String status;
-
-}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/mapper/ShopCurrencyMapper.java

@@ -1,7 +0,0 @@
-package edu.travel.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import edu.travel.entity.ShopCurrency;
-
-public interface ShopCurrencyMapper extends BaseMapper<ShopCurrency> {
-}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryRemoteController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/baseCountry",name = "commodity")
+@FeignClient(path = "/baseCountry",name = "country-dev")
 public interface BaseCountryRemoteController extends RemoteBaseController<BaseCountryVo, BaseCountryDto> {
 
     //国家树
@@ -21,14 +21,5 @@ public interface BaseCountryRemoteController extends RemoteBaseController<BaseCo
     //国家分页
     @GetMapping("/getCountryPage")
     public RPCBaseResponse<IPage<BaseCountryVo>> getCountryPage(BaseCountryDto baseCountryDTO);
-    @GetMapping("/getCountryFormId")
-    public RPCBaseResponse<BaseCountryVo> getFormId(String id);
-    @PostMapping("/updateCountryFormId")
-    public RPCBaseResponse<BaseCountryVo> updateTargetFormId(@RequestBody BaseCountryDto entity);
-    @PostMapping("/saveCountryForm")
-    public RPCBaseResponse<BaseCountryVo> saveFormTarget(@RequestBody BaseCountryDto entity);
-    @PostMapping("/deleteCountryFormId")
-    public RPCBaseResponse<BaseCountryVo> deleteTargetFormId(@RequestBody List<String> ids);
-    @GetMapping("/CountrylistForm")
-    public RPCBaseResponse<List<BaseCountryVo>> getAllForm();
+
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java

@@ -6,28 +6,11 @@ import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.vo.BaseCountryServeVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
-
-@FeignClient(path = "/baseCountryServe",name = "commodity")
+@FeignClient(path = "/baseCountryServe",name = "country-dev")
 public interface BaseCountryServeRemoteController extends RemoteBaseController<BaseCountryServeVo, BaseCountryServeDto> {
     //服务国家树
     @GetMapping("/getCountryServeTree")
     public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree();
-    //获取服务国家信息
-    @GetMapping("/getCountryServeFormId")
-    public RPCBaseResponse<BaseCountryServeVo> getFormId(String id);
-    //更新服务国家信息
-    @GetMapping("/updateCountryServeFormId")
-    public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(@RequestBody BaseCountryServeDto entity);
-    //新增服务国家信息
-    @GetMapping("/saveCountryServeForm")
-    public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(@RequestBody BaseCountryServeDto entity);
-    //删除服务国家信息
-    @GetMapping("/deleteCountryServeFormId")
-    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(@RequestBody List<String> ids);
-    //获取服务国家列表
-    @GetMapping("/listForm")
-    public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm();
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopCurrencyRemoteController.java

@@ -11,18 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
-@FeignClient(path = "/shopCurrency",name = "commodity")
+@FeignClient(path = "/shopCurrency",name = "country-dev")
 public interface ShopCurrencyRemoteController extends RemoteBaseController<ShopCurrencyVo, ShopCurrencyDto> {
     @GetMapping("/getCurrencyPage")
     public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto);
-    @GetMapping("/getCurrencyFormId")
-    public RPCBaseResponse<ShopCurrencyVo> getFormId(String id);
-    @PostMapping("/updateCurrencyFormId")
-    public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(ShopCurrencyDto entity);
-    @PostMapping("/saveCurrencyForm")
-    public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(ShopCurrencyDto entity);
-    @PostMapping("/deleteCurrencyFormId")
-    public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(List<String> ids);
-    @GetMapping("/listCurrencyForm")
-    public RPCBaseResponse<List<ShopCurrencyVo>> getAllForm();
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopLanguageRemoteController.java

@@ -12,25 +12,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/shopLanguage",name = "commodity")
+@FeignClient(path = "/shopLanguage",name = "country-dev")
 public interface ShopLanguageRemoteController extends RemoteBaseController<ShopLanguageVo, ShopLanguageDto> {
 
     //语言分页
     @GetMapping("/getLanguagePage")
     public RPCBaseResponse<IPage<ShopLanguageVo>> getLanguagePage(ShopLanguageDto shopLanguageDto);
-   //获取语言详情
-    @GetMapping("/getLanguageFormId")
-    public RPCBaseResponse<ShopLanguageVo> getFormId(String id);
-    //更新语言信息
-    @PostMapping("/updateLanguageFormId")
-    public RPCBaseResponse<ShopLanguageVo> updateTargetFormId(@RequestBody ShopLanguageDto entity);
-    //新增语言信息
-    @PostMapping("/saveLanguageForm")
-    public RPCBaseResponse<ShopLanguageVo> saveFormTarget(@RequestBody ShopLanguageDto entity);
-    //删除语言信息
-    @PostMapping("/deleteLanguageFormId")
-    public RPCBaseResponse<ShopLanguageVo> deleteTargetFormId(@RequestBody List<String> ids);
-    //获取语言
-    @GetMapping("/LanguagelistForm")
-    public RPCBaseResponse<List<ShopLanguageVo>> getAllForm();
+
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeVo.java

@@ -1,9 +1,7 @@
 package edu.travel.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import edu.travel.annotation.LinkOne;
 import edu.travel.entity.BaseEntity;
-import edu.travel.mapper.ShopCurrencyMapper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -83,7 +81,6 @@ public class BaseCountryServeVo extends BaseEntity {
      *map
      */
     @TableField(exist = false)
-    @LinkOne(linkField = "currencyId", linkMapper = ShopCurrencyMapper.class, linkPrimaryField = "id")
     private Map<String, Object> map;
     /**
      * 子类

edu-travel-remote/edu-travel-remote-order/pom.xml

@@ -0,0 +1,70 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-remote</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-remote-order</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-remote-order</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-resp</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-openfeign</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-model-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.13.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-commodity</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/dto/AddShopOrderDto.java

@@ -0,0 +1,28 @@
+package edu.travel.remote.dto;
+
+import lombok.Data;
+
+@Data
+public class AddShopOrderDto {
+
+    /**地区id*/
+    private String countryId;
+
+    /**商品ID*/
+    private String productId;
+
+    /**
+     * sku
+     */
+    private String skuId;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/dto/GetOrderItemDto.java

@@ -0,0 +1,15 @@
+package edu.travel.remote.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GetOrderItemDto implements Serializable {
+
+    private String orderId;
+
+    private String skuId;
+
+    private String productId;
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/dto/ShowOrderInfoDto.java

@@ -0,0 +1,11 @@
+package edu.travel.remote.dto;
+
+import lombok.Data;
+
+@Data
+public class ShowOrderInfoDto extends BaseDto{
+    /**
+     * 状态
+     */
+    private String state;
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/order/ShopOrderItemRemoteController.java

@@ -0,0 +1,20 @@
+package edu.travel.remote.order;
+
+import edu.travel.remote.dto.GetOrderItemDto;
+import edu.travel.remote.vo.OrderItemVo;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(name = "order-dev",path = "/shopOrderItem")
+public interface ShopOrderItemRemoteController {
+
+    /**
+     *  查询订单商品详情
+     * @param params
+     * @return {@link RPCBaseResponse }<{@link OrderItemVo }>
+     */
+    @GetMapping("/getOrderItemVo")
+    public RPCBaseResponse<OrderItemVo> getOrderItemVo(GetOrderItemDto params);
+
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/vo/OrderItemVo.java

@@ -0,0 +1,64 @@
+package edu.travel.remote.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderItemVo {
+
+    /**
+     * 订单商品表ID
+     */
+    private String id;
+
+    /**
+     * 订单表ID
+     */
+    private String orderId;
+
+    /**
+     * SKU
+     */
+    private String skuId;
+
+    /**
+     * 数量
+     */
+    private String quantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 使用的用户优惠券ID
+     */
+    private String userCouponId;
+
+    /**
+     * 优惠券抵扣金额
+     */
+    private BigDecimal couponDiscount;
+
+    /**
+     * 商品快照
+     */
+    private String snapshot;
+    /**
+     * 商品快照对象
+     */
+    private ShopSnapshotVo shopSnapshotVo;
+
+    /**
+     * 订单商品状态 默认0 -0正常;-1退货
+     */
+    private Integer state;
+
+    /**
+     * 商品ID
+     */
+    private String productId;
+
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/vo/ShopSnapshotVo.java

@@ -0,0 +1,40 @@
+package edu.travel.remote.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 类功能描述：
+ *  商品快照对象
+ * @author 大春
+ * @date 2025/03/05
+ */
+
+@Data
+public class ShopSnapshotVo {
+    /**
+     * SKU
+     */
+    private String skuId;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品描述
+     */
+    private String description;
+    /**
+     * 商品SkU的图片
+     */
+    private String imageUrl;
+    /**
+     * 商品快照规格
+     */
+    private List<SpecValueVo> snapshotSpec;
+
+}

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/vo/ShowOrderInfoVo.java

@@ -0,0 +1,108 @@
+package edu.travel.remote.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ShowOrderInfoVo {
+    /**
+     * 订单表ID 订单号
+     */
+    private String id;
+
+    /**
+     * 仓库ID
+     */
+    private String warehouseId;
+
+    /**
+     * 订单备注
+     */
+    private String orderRemark;
+
+    /**
+     * 国家id
+     */
+    private String countryId;
+
+    /**
+     * 服务费id
+     */
+    private String serviceChargeId;
+
+    /**
+     * 服务费比率
+     */
+    private BigDecimal serviceChargeValue;
+
+    /**
+     * 支付方式id
+     */
+    private String payId;
+
+    /**
+     * 支付方法值
+     */
+    private String payWayValue;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 收货地址
+     */
+    private String addressId;
+
+    /**
+     * 收货地址
+     */
+    private String address;
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 累计金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 货币
+     */
+    private String currencyId;
+
+    /**
+     * 汇率
+     */
+    private BigDecimal exchangeRate;
+
+    /**
+     * 0待付款, 1已下单, 2待发货,3待收货,4待评价,5已完成,6已取消
+     */
+    private Integer status;
+
+    /**
+     * 支付时间
+     */
+    private Date paymentTime;
+
+    /**
+     * 优惠券抵扣金额
+     */
+    private BigDecimal couponDiscount;
+
+    /**
+     * 平台优惠券ID
+     */
+    private String globalCouponId;
+    /**
+     * 订单商品详情
+     */
+    private List<OrderItemVo> orderItemVoList;
+}

edu-travel-remote/edu-travel-remote-tenant/pom.xml

@@ -51,5 +51,11 @@
             <artifactId>edu-travel-common-core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/SysRoleDto.java

@@ -0,0 +1,39 @@
+package edu.travel.remote.feign.mode.dto.tenant;
+
+import edu.travel.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * SysRoloVo 类。
+ * <p>
+ * 描述：
+ *
+ * @author huangwenwen
+ * @date 2025/2/12
+ */
+
+@Data
+public class SysRoleDto extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色描述
+     */
+    private String remark;
+
+    /**
+     * 状态 0禁用1启用
+     */
+    private Byte status;
+
+}
+
+

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/vo/tenant/EduTenantVo.java

@@ -3,6 +3,7 @@ package edu.travel.remote.feign.mode.vo.tenant;
 import edu.travel.entity.BaseEntity;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +92,6 @@ public class EduTenantVo extends BaseEntity {
     /**
      * 用户角色列表
      */
-    private List<Long> roleIdList;
+    private List<String> roleIds = new ArrayList<>();
 
 }

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/vo/tenant/SysMenuExtraDataVo.java

@@ -21,12 +21,12 @@ public class SysMenuExtraDataVo {
     /**
      * 主键id
      */
-    private Long id;
+    private String id;
 
     /**
      * 菜单id
      */
-    private Long menuId;
+    private String menuId;
 
     /**
      * 菜单图标名称

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/tenant/SysRoleRemoteController.java

@@ -1,10 +1,13 @@
 package edu.travel.tenant;
 
+import edu.travel.remote.base.RemoteBaseController;
 import edu.travel.remote.feign.mode.dto.tenant.AddOrUpdateRoleDto;
 import edu.travel.remote.feign.mode.dto.tenant.AssignRolesOrMenusDto;
+import edu.travel.remote.feign.mode.dto.tenant.SysRoleDto;
 import edu.travel.remote.feign.mode.dto.tenant.SysRolePageDto;
 import edu.travel.remote.feign.mode.vo.tenant.SysRoleVo;
 import edu.travel.resp.BaseResponse;
+import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,7 +17,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 @FeignClient(name = "tenant-dev",path = "/sysRole")
-public interface SysRoleRemoteController {
+public interface SysRoleRemoteController extends RemoteBaseController<SysRoleVo, SysRoleDto> {
+    /**
+     * 通过id查找角色
+     */
+    @GetMapping("/getFormId")
+    public RPCBaseResponse<SysRoleVo> getFormId(@RequestParam("id") String id);
     /**
      * 新增管理角色并分配菜单
      */
@@ -43,14 +51,14 @@ public interface SysRoleRemoteController {
 //    @PreAuthorize("hasRole('超级管理员')")
     public BaseResponse<Boolean> updateRoleAndMenusById( @RequestBody AddOrUpdateRoleDto addOrUpdateRoleDto);
 
-    /**
-     * 为角色分配菜单
-     * @param dto
-     * @return
-     */
-    @PostMapping("/assignMenusToRole")
-//    @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<Boolean> assignMenusToRole(@RequestBody AssignRolesOrMenusDto dto);
+//    /**
+//     * 为角色分配菜单
+//     * @param dto
+//     * @return
+//     */
+//    @PostMapping("/assignMenusToRole")
+////    @PreAuthorize("hasRole('超级管理员')")
+//    public BaseResponse<Boolean> assignMenusToRole(@RequestBody AssignRolesOrMenusDto dto);
 
     /**
      * 更新角色菜单

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/tenant/TenantRemoteController.java

@@ -1,5 +1,6 @@
 package edu.travel.tenant;
 
+import edu.travel.remote.base.RemoteBaseController;
 import edu.travel.remote.feign.mode.dto.tenant.AddOrUpdateTenantDto;
 import edu.travel.remote.feign.mode.dto.tenant.AssignRolesOrMenusDto;
 import edu.travel.remote.feign.mode.dto.tenant.EduTenantPageDto;
@@ -12,11 +13,13 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import java.util.List;
 import java.util.Set;
 
 @FeignClient(name = "tenant-dev",path = "/user")
-public interface TenantRemoteController {
+public interface TenantRemoteController  extends RemoteBaseController<EduTenantVo, AddOrUpdateTenantDto> {
 
     @GetMapping("/getTenantByPhoneNumber")
 //    @PreAuthorize("hasRole('超级管理员')")
@@ -53,7 +56,7 @@ public interface TenantRemoteController {
      */
     @GetMapping("/getTenantById")
 //    @PreAuthorize("hasRole('超级管理员')")
-    public RPCBaseResponse<EduTenantVo> getTenantById(Long id);
+    public RPCBaseResponse<EduTenantVo> getTenantById(@RequestParam("id") Long id);
     /**
      * 通过id查询商城用户信息
      */

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/dto/ShopWarehouseDto.java

@@ -0,0 +1,63 @@
+package edu.travel.dto;
+
+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 edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 库房表
+ */
+@Data
+public class ShopWarehouseDto extends PagePO {
+    /**
+     * 库房表ID
+     */
+    private Long id;
+
+    /**
+     * 0是总仓
+     */
+    private Long parentId;
+
+    /**
+     * 库房名称
+     */
+    private String warehouseName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 国家ID
+     */
+    private String countryServeId;
+
+    /**
+     * 库房详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * '启用禁用 0 启用 1禁用'
+     */
+    private Integer status;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+}

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/dto/ShopWarehouseStaffDto.java

@@ -0,0 +1,71 @@
+package edu.travel.dto;
+
+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 edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 库房人员关联表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_warehouse_staff")
+public class ShopWarehouseStaffDto extends PagePO {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 库房ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色
+     */
+    private Long roleId;
+
+    /**
+     * 系统标识
+     */
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+}

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseRemoteController.java

@@ -0,0 +1,17 @@
+package edu.travel.remote;
+
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(path = "/shopWarehouse", name = "warehouse")
+public interface ShopWarehouseRemoteController extends RemoteBaseController<ShopWarehouseVo, ShopWarehouseDto> {
+
+}

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/vo/ShopWarehouseStaffVo.java

@@ -0,0 +1,60 @@
+package edu.travel.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 库房人员关联表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_warehouse_staff")
+public class ShopWarehouseStaffVo extends BaseEntity {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 库房ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+    /**
+     * 用户名
+     */
+    private String tenantName;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+    /**
+     * 姓
+     */
+    private String tenantSurname;
+    /**
+     * 名
+     */
+    private String name;
+/**
+ * 全名
+ */
+    private String tenantNameFull;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+}

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/vo/ShopWarehouseVo.java

@@ -0,0 +1,92 @@
+package edu.travel.vo;
+
+import edu.travel.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 库房表
+ */
+@Data
+public class ShopWarehouseVo extends BaseEntity {
+    /**
+     * 库房表ID
+     */
+    private Long id;
+
+    /**
+     * 0是总仓
+     */
+    private Long parentId;
+
+    /**
+     * 库房名称
+     */
+    private String warehouseName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 国家ID
+     */
+    private String countryServeId;
+
+    /**
+     * 库房详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * '启用禁用 0 启用 1禁用'
+     */
+    private Integer status;
+
+    /**
+     * 系统标识
+     */
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+    /**
+     * map
+     */
+    private Map<String, Object> map;
+    /**
+     * 子集
+     */
+    private List<ShopWarehouseVo> children; // 新增字段
+}

edu-travel-remote/pom.xml

@@ -18,6 +18,7 @@
         <module>edu-travel-remote-base</module>
         <module>edu-travel-remote-commodity</module>
         <module>edu-travel-remote-country</module>
+        <module>edu-travel-remote-order</module>
     </modules>
 
     <properties>

edu-travel-service/edu-travel-service-commodity/pom.xml

@@ -125,6 +125,11 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-adapter-order</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
             <artifactId>edu-travel-remote-commodity</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

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

@@ -1,41 +0,0 @@
-package edu.travel.commodity.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 java.util.Date;
-
-import edu.travel.entity.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 商品评论表
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "shop_mg_label")
-public class ShopMgLabel extends BaseEntity {
-    /**
-     * 商品评论表ID
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 父级ID、0为一级评论
-     */
-    @TableField(value = "review_id")
-    private Long reviewId;
-
-    /**
-     * 图片地址
-     */
-    @TableField(value = "img_url")
-    private String imgUrl;
-
-
-}

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

@@ -43,5 +43,9 @@ public class ShopProductParameters extends BaseEntity {
     @TableField(value = "parameters_value")
     private String parametersValue;
 
-
+    /**
+     * 国家ID
+     */
+    @TableField(value = "country_id")
+    private Long countryId;
 }

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

@@ -31,5 +31,10 @@ public class ShopSpec extends BaseEntity {
     @TableField(value = "spec_name")
     private String specName;
 
+    /**
+     * 国家ID
+     */
+    @TableField(value = "country_id")
+    private Long countryId;
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopMgLabelMapper.java

@@ -1,7 +0,0 @@
-package edu.travel.commodity.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import edu.travel.commodity.entity.ShopMgLabel;
-
-public interface ShopMgLabelMapper extends BaseMapper<ShopMgLabel> {
-}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopProductSpecMapper.java

@@ -2,7 +2,7 @@ package edu.travel.commodity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import edu.travel.commodity.entity.ShopProductSpec;
-import edu.travel.vo.ShopSkuSpecValueVo;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
 
 import java.util.List;
 import java.util.Set;
@@ -10,4 +10,5 @@ import java.util.Set;
 public interface ShopProductSpecMapper extends BaseMapper<ShopProductSpec> {
 
     List<ShopSkuSpecValueVo> getSkuValue(Set<String> skus, String project);
+
 }

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

@@ -3,9 +3,9 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopAddress;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.BaseDto;
-import edu.travel.dto.UpdateAddressDto;
-import edu.travel.vo.ShopAddressVo;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.UpdateAddressDto;
+import edu.travel.remote.vo.ShopAddressVo;
 
 public interface ShopAddressService extends IService<ShopAddress>{
 

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

@@ -2,9 +2,9 @@ package edu.travel.commodity.service;
 
 import edu.travel.commodity.entity.ShopCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.BaseDto;
-import edu.travel.dto.ShopTypeDto;
-import edu.travel.vo.ShopTypeVo;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.ShopTypeDto;
+import edu.travel.remote.vo.ShopTypeVo;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

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

@@ -3,8 +3,8 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopFavorite;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.BaseDto;
-import edu.travel.vo.ShopFavoriteVo;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.vo.ShopFavoriteVo;
 
 public interface ShopFavoriteService extends IService<ShopFavorite>{
 

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

@@ -1,8 +0,0 @@
-package edu.travel.commodity.service;
-
-import edu.travel.commodity.entity.ShopMgLabel;
-import com.baomidou.mybatisplus.extension.service.IService;
-public interface ShopMgLabelService extends IService<ShopMgLabel>{
-
-
-}

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

@@ -3,8 +3,8 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopParameters;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.ProductSpecDto;
-import edu.travel.vo.ShopParametersVo;
+import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.vo.ShopParametersVo;
 
 public interface ShopParametersService extends IService<ShopParameters>{
 

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

@@ -3,9 +3,9 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopProduct;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.GetProductByTypeDto;
-import edu.travel.dto.SearchProductDto;
-import edu.travel.vo.ShopProductVo;
+import edu.travel.remote.dto.GetProductByTypeDto;
+import edu.travel.remote.dto.SearchProductDto;
+import edu.travel.remote.vo.ShopProductVo;
 
 import java.io.IOException;
 

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

@@ -2,7 +2,7 @@ package edu.travel.commodity.service;
 
 import edu.travel.commodity.entity.ShopProductSku;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.vo.ShopSkuSpecValueVo;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
 
 import java.util.List;
 import java.util.Map;

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

@@ -2,9 +2,9 @@ package edu.travel.commodity.service;
 
 import edu.travel.commodity.entity.ShopProductSpec;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.ProductSpecDto;
-import edu.travel.vo.ProductSpecVo;
-import edu.travel.vo.SpecSortVo;
+import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.vo.ProductSpecVo;
+import edu.travel.remote.vo.SpecSortVo;
 
 import java.util.List;
 

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

@@ -3,12 +3,14 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopReview;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.ProductSpecDto;
-import edu.travel.vo.ShopReviewVo;
+import edu.travel.remote.dto.AddReviewDto;
+import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.vo.ShopReviewVo;
 
 public interface ShopReviewService extends IService<ShopReview>{
 
 
     Page<ShopReviewVo> getShopReview(ProductSpecDto params);
 
+    String addReview(AddReviewDto params);
 }

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

@@ -3,8 +3,8 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopSearchRecords;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.SearchRecordListDto;
-import edu.travel.vo.SearchRecordsVo;
+import edu.travel.remote.dto.SearchRecordListDto;
+import edu.travel.remote.vo.SearchRecordsVo;
 
 public interface ShopSearchRecordsService extends IService<ShopSearchRecords>{
 

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

@@ -3,9 +3,9 @@ package edu.travel.commodity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopShoppingCart;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.dto.AddShopCartDto;
-import edu.travel.dto.BaseDto;
-import edu.travel.vo.ShopCartListVo;
+import edu.travel.remote.dto.AddShopCartDto;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.vo.ShopCartListVo;
 
 public interface ShopShoppingCartService extends IService<ShopShoppingCart>{
 

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

@@ -11,9 +11,9 @@ import edu.travel.commodity.mapper.ShopAddressMapper;
 import edu.travel.commodity.service.ShopAddressService;
 import edu.travel.commodity.utils.PageUtil;
 import edu.travel.commodity.utils.TokenData;
-import edu.travel.dto.BaseDto;
-import edu.travel.dto.UpdateAddressDto;
-import edu.travel.vo.ShopAddressVo;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.UpdateAddressDto;
+import edu.travel.remote.vo.ShopAddressVo;
 import org.springframework.stereotype.Service;
 
 

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

@@ -14,9 +14,9 @@ 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.dto.BaseDto;
-import edu.travel.dto.ShopTypeDto;
-import edu.travel.vo.ShopTypeVo;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.ShopTypeDto;
+import edu.travel.remote.vo.ShopTypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -11,9 +11,9 @@ import edu.travel.commodity.service.ShopFavoriteService;
 import edu.travel.commodity.service.ShopProductService;
 import edu.travel.commodity.utils.PageUtil;
 import edu.travel.commodity.utils.TokenData;
-import edu.travel.dto.BaseDto;
+import edu.travel.remote.dto.BaseDto;
 import edu.travel.service.SysServiceImpl;
-import edu.travel.vo.ShopFavoriteVo;
+import edu.travel.remote.vo.ShopFavoriteVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,12 +0,0 @@
-package edu.travel.commodity.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import edu.travel.commodity.entity.ShopMgLabel;
-import edu.travel.commodity.mapper.ShopMgLabelMapper;
-import edu.travel.commodity.service.ShopMgLabelService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ShopMgLabelServiceImpl extends ServiceImpl<ShopMgLabelMapper, ShopMgLabel> implements ShopMgLabelService {
-
-}

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

@@ -10,8 +10,8 @@ import edu.travel.commodity.service.ShopParametersService;
 import edu.travel.commodity.service.ShopProductParametersService;
 import edu.travel.commodity.service.ShopProductService;
 import edu.travel.commodity.utils.PageUtil;
-import edu.travel.dto.ProductSpecDto;
-import edu.travel.vo.ShopParametersVo;
+import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.vo.ShopParametersVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -10,9 +10,9 @@ import edu.travel.commodity.entity.ShopProduct;
 import edu.travel.commodity.mapper.ShopProductMapper;
 import edu.travel.commodity.service.ShopProductService;
 import edu.travel.commodity.utils.PageUtil;
-import edu.travel.dto.GetProductByTypeDto;
-import edu.travel.dto.SearchProductDto;
-import edu.travel.vo.ShopProductVo;
+import edu.travel.remote.dto.GetProductByTypeDto;
+import edu.travel.remote.dto.SearchProductDto;
+import edu.travel.remote.vo.ShopProductVo;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

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

@@ -5,7 +5,7 @@ import edu.travel.commodity.entity.ShopProductSku;
 import edu.travel.commodity.mapper.ShopProductSkuMapper;
 import edu.travel.commodity.mapper.ShopProductSpecMapper;
 import edu.travel.commodity.service.ShopProductSkuService;
-import edu.travel.vo.ShopSkuSpecValueVo;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;

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

@@ -9,8 +9,8 @@ import edu.travel.commodity.constant.BaseConstant;
 import edu.travel.commodity.entity.*;
 import edu.travel.commodity.mapper.ShopProductSpecMapper;
 import edu.travel.commodity.service.*;
-import edu.travel.dto.ProductSpecDto;
-import edu.travel.vo.*;
+import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;

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

@@ -1,23 +1,27 @@
 package edu.travel.commodity.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.adapter.service.order.OrderItemAdapter;
 import edu.travel.adapter.service.tenant.TenantAdapter;
 import edu.travel.commodity.entity.ShopReview;
 import edu.travel.commodity.mapper.ShopReviewMapper;
 import edu.travel.commodity.service.ShopReviewService;
 import edu.travel.commodity.utils.PageUtil;
-import edu.travel.commodity.utils.StringToListUtil;
-import edu.travel.dto.ProductSpecDto;
+import edu.travel.commodity.utils.StringUtil;
+import edu.travel.commodity.utils.TokenData;
+import edu.travel.remote.dto.AddReviewDto;
+import edu.travel.remote.dto.GetOrderItemDto;
+import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.exception.BaseException;
 import edu.travel.remote.feign.mode.vo.tenant.EduTenantVo;
+import edu.travel.remote.vo.*;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.vo.ShopReviewVo;
-import edu.travel.vo.SpecOneVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +35,8 @@ import java.util.stream.Collectors;
 public class ShopReviewServiceImpl extends ServiceImpl<ShopReviewMapper, ShopReview> implements ShopReviewService {
     @Autowired
     private TenantAdapter tenantAdapter;
+    @Autowired
+    private OrderItemAdapter orderItemAdapter;
     @Override
     public Page<ShopReviewVo> getShopReview(ProductSpecDto params) {
         LambdaQueryWrapper<ShopReview> query = Wrappers.<ShopReview>lambdaQuery()
@@ -56,13 +62,56 @@ public class ShopReviewServiceImpl extends ServiceImpl<ShopReviewMapper, ShopRev
             users.put(datum.getId(), datum);
         }
         for (ShopReviewVo record : records) {
-            List<String> list = StringToListUtil.toList(record.getImage());
+            List<String> list = StringUtil.toList(record.getImage());
             record.setImageUrls(list);
-            SpecOneVo bean = JSONUtil.toBean(record.getSkuDetails(), SpecOneVo.class);
-            record.setSpecOneVo(bean);
+            if(!ObjectUtil.isEmpty(record.getSkuDetails())){
+                String jsonPrettyStr = JSONUtil.toJsonPrettyStr(record.getSkuDetails());
+                List<SpecOneVo> list1 = JSONUtil.toList(jsonPrettyStr, SpecOneVo.class);
+                record.setSpecOneVo(list1);
+            }
             EduTenantVo eduTenantVo = users.get(record.getUserId());
             record.setEduTenantVo(eduTenantVo);
         }
         return pageEntity;
     }
+
+    @Override
+    public String addReview(AddReviewDto params) {
+        String userId = TokenData.getUserId();
+        LambdaQueryWrapper<ShopReview> query = Wrappers.<ShopReview>lambdaQuery().eq(ShopReview::getUserId, userId)
+                .eq(ShopReview::getOrderId, params.getOrderId())
+                .eq(ShopReview::getProductId, params.getProductId());
+        List<ShopReview> list = list(query);
+        if(!ObjectUtil.isEmpty(list)){
+            return "您已经评价过了";
+        }
+        ShopReview bean = BeanUtil.toBean(params, ShopReview.class);
+        bean.setUserId(Long.valueOf(userId));
+        String image = StringUtil.toListString(params.getImage());
+        bean.setImage(image);
+        //获取商品sku快照 SpecOneVo JSON
+        GetOrderItemDto getOrderItemDto = new GetOrderItemDto();
+        getOrderItemDto.setOrderId(params.getOrderId());
+        getOrderItemDto.setSkuId(params.getSkuId());
+        getOrderItemDto.setProductId(params.getProductId());
+        RPCBaseResponse<OrderItemVo> result = orderItemAdapter.getOrderItemVo(getOrderItemDto);
+        if(result.getCode()!=200){
+            throw new BaseException(result.getCode(), result.getMsg());
+        }
+        OrderItemVo data = result.getData();
+        if(data == null){
+            return "订单信息有误";
+        }
+        String snapshot = data.getSnapshot();
+        if(!ObjectUtil.isEmpty(snapshot)){
+            //订单快照对象
+            ShopSnapshotVo bean1 = JSONUtil.toBean(snapshot, ShopSnapshotVo.class);
+            List<SpecValueVo> snapshot1 = bean1.getSnapshotSpec();
+            String jsonStr = JSONUtil.toJsonStr(snapshot1);
+            bean.setSkuDetails(jsonStr);
+        }
+        bean.setUpdateUserId(userId);
+        save(bean);
+        return "评价成功";
+    }
 }

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

@@ -8,8 +8,8 @@ import edu.travel.commodity.entity.ShopSearchRecords;
 import edu.travel.commodity.mapper.ShopSearchRecordsMapper;
 import edu.travel.commodity.service.ShopSearchRecordsService;
 import edu.travel.commodity.utils.PageUtil;
-import edu.travel.dto.SearchRecordListDto;
-import edu.travel.vo.SearchRecordsVo;
+import edu.travel.remote.dto.SearchRecordListDto;
+import edu.travel.remote.vo.SearchRecordsVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

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

@@ -17,12 +17,12 @@ import edu.travel.commodity.service.ShopProductSkuService;
 import edu.travel.commodity.service.ShopShoppingCartService;
 import edu.travel.commodity.utils.PageUtil;
 import edu.travel.commodity.utils.TokenData;
-import edu.travel.dto.AddShopCartDto;
-import edu.travel.dto.BaseDto;
+import edu.travel.remote.dto.AddShopCartDto;
+import edu.travel.remote.dto.BaseDto;
 import edu.travel.exception.BaseException;
-import edu.travel.vo.ShopCartListVo;
-import edu.travel.vo.ShopSkuSpecValueVo;
-import edu.travel.vo.SpecValueVo;
+import edu.travel.remote.vo.ShopCartListVo;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
+import edu.travel.remote.vo.SpecValueVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;

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

@@ -1,20 +0,0 @@
-package edu.travel.commodity.utils;
-
-import cn.hutool.core.util.ObjectUtil;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Data
-public class StringToListUtil {
-
-    public static List<String> toList(String str){
-        List<String> list = new ArrayList<>();
-        if(ObjectUtil.isEmpty(str)){
-            list = Arrays.asList(str.split(","));
-        }
-        return list;
-    }
-}

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

@@ -0,0 +1,26 @@
+package edu.travel.commodity.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+public class StringUtil {
+
+    public static List<String> toList(String str){
+        if(!ObjectUtil.isEmpty(str)){
+            return Arrays.asList(str.split(","));
+        }
+        return new ArrayList<>();
+    }
+    public static String toListString(List<String> list){
+        String result="";
+        for (String s : list) {
+            result=s+",";
+        }
+        return result;
+    }
+}

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

@@ -3,18 +3,17 @@ package edu.travel.commodity.web;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopAddress;
 import edu.travel.commodity.service.ShopAddressService;
-import edu.travel.dto.BaseDto;
-import edu.travel.dto.UpdateAddressDto;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.UpdateAddressDto;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.vo.ShopAddressVo;
+import edu.travel.remote.vo.ShopAddressVo;
 import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static edu.travel.rpc.RPCBaseResponse.success;
-import static org.bouncycastle.asn1.cmc.CMCStatus.success;
 
 /**
 * 地址表(shop_address)表控制层

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

@@ -2,12 +2,12 @@ package edu.travel.commodity.web;
 
 import edu.travel.commodity.entity.ShopCategory;
 import edu.travel.commodity.service.ShopCategoryService;
-import edu.travel.dto.BaseDto;
-import edu.travel.dto.ShopTypeDto;
+import edu.travel.remote.dto.BaseDto;
+import edu.travel.remote.dto.ShopTypeDto;
 import edu.travel.remote.feign.mode.vo.tenant.AddMenuVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.vo.ShopTypeVo;
+import edu.travel.remote.vo.ShopTypeVo;
 import edu.travel.web.BaseController;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -2,9 +2,9 @@ package edu.travel.commodity.web;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.service.ShopFavoriteService;
-import edu.travel.dto.BaseDto;
+import edu.travel.remote.dto.BaseDto;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.vo.ShopFavoriteVo;
+import edu.travel.remote.vo.ShopFavoriteVo;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,23 +0,0 @@
-package edu.travel.commodity.web;
-
-import edu.travel.commodity.service.ShopMgLabelService;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
-* 商品评论表(shop_mg_label)表控制层
-*
-* @author xxxxx
-*/
-@RestController
-@RequestMapping("/shop_mg_label")
-public class ShopMgLabelController {
-/**
-* 服务对象
-*/
-    @Autowired
-    private ShopMgLabelService shopMgLabelService;
-
-
-}

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

@@ -2,10 +2,10 @@ package edu.travel.commodity.web;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.service.ShopParametersService;
-import edu.travel.dto.ProductSpecDto;
+import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.vo.ShopParametersVo;
+import edu.travel.remote.vo.ShopParametersVo;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;