fix：服务名修改

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/web/BaseController.java

@@ -7,7 +7,6 @@ import edu.travel.resp.BaseResponse;
 import edu.travel.resp.PageResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.rpc.RPCPageResponse;
-import edu.travel.utils.tree.CustomDeepCopy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;

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

@@ -37,5 +37,16 @@ public class ShopProductSpec extends BaseEntity {
     @TableField(value = "spec_name")
     private String specName;
 
+    /**
+     *  规格Id
+     */
+    @TableField(value = "spec_id")
+    private String specId;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "sort_order")
+    private String sortOrder;
 
 }

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

@@ -37,4 +37,16 @@ public class ShopSpecValue extends BaseEntity {
     @TableField(value = "spec_value")
     private String specValue;
 
+    /**
+     * 权重
+     */
+    @TableField(value = "sort_order")
+    private String sortOrder;
+
+    /**
+     * 商品ID
+     */
+    @TableField(value = "product_id")
+    private String productId;
+
 }

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

@@ -8,23 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.commodity.dto.BaseDto;
 import edu.travel.commodity.dto.UpdateAddressDto;
-import edu.travel.commodity.entity.BaseCountry;
 import edu.travel.commodity.entity.ShopAddress;
 import edu.travel.commodity.mapper.ShopAddressMapper;
-import edu.travel.commodity.service.BaseCountryService;
 import edu.travel.commodity.service.ShopAddressService;
 import edu.travel.commodity.utils.PageUtil;
 import edu.travel.commodity.utils.TokenData;
 import edu.travel.commodity.vo.ShopAddressVo;
-import edu.travel.exception.BaseException;
-import org.springframework.beans.factory.annotation.Autowired;
+import edu.travel.remote.BaseCountryRemoteController;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 
 @Service
 public class ShopAddressServiceImpl extends ServiceImpl<ShopAddressMapper, ShopAddress> implements ShopAddressService {
-    @Autowired
-    private BaseCountryService baseCountryService;
+    @Resource
+    private BaseCountryRemoteController baseCountryRemoteController;
     @Override
     public Page<ShopAddressVo> getShopAddress(BaseDto dto) {
         //当前登录对象
@@ -39,10 +38,10 @@ public class ShopAddressServiceImpl extends ServiceImpl<ShopAddressMapper, ShopA
     @Override
     public boolean updateAddressById(UpdateAddressDto param) {
         if(!ObjectUtil.isEmpty(param.getCountryId())){
-            BaseCountry byId = baseCountryService.getById(param.getCountryId());
-            if(byId==null){
-                throw new BaseException("国家不存在");
-            }
+//            BaseCountry byId = baseCountryService.getById(param.getCountryId());
+//            if(byId==null){
+//                throw new BaseException("国家不存在");
+//            }
         }
         LambdaQueryWrapper<ShopAddress> query = Wrappers.<ShopAddress>lambdaQuery().eq(ShopAddress::getId, param.getId())
                 .eq(ShopAddress::getUserId, TokenData.getUserId());

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

@@ -5,7 +5,6 @@ import edu.travel.commodity.dto.BaseDto;
 import edu.travel.commodity.dto.UpdateAddressDto;
 import edu.travel.commodity.entity.ShopAddress;
 import edu.travel.commodity.service.ShopAddressService;
-import edu.travel.commodity.vo.BaseCountryServeVo;
 import edu.travel.commodity.vo.ShopAddressVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.web.BaseController;
@@ -20,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/shopAddress")
-public class ShopAddressController extends BaseController {
+public class ShopAddressController extends BaseController<ShopAddress> {
 /**
 * 服务对象
 */

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

@@ -13,10 +13,12 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+    <result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
+    <result column="spec_id" jdbcType="INTEGER" property="specId" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, product_id, spec_name, project, create_time, create_user_id, update_time, update_user_id, 
-    delete_flag
+    delete_flag,sort_order,spec_id
   </sql>
 </mapper>

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

@@ -13,10 +13,12 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+    <result column="sort_order" jdbcType="BIGINT" property="sortOrder" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, spec_id, spec_value, project, create_time, create_user_id, update_time, update_user_id, 
-    delete_flag
+    delete_flag,sort_order,product_id
   </sql>
 </mapper>

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

@@ -7,7 +7,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>edu.travel</groupId>
     <artifactId>edu-travel-service-order</artifactId>
     <packaging>jar</packaging>
 

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/ShopBannerController.java

@@ -2,6 +2,7 @@ package edu.travel.tenant.web;
 
 import edu.travel.resp.BaseResponse;
 import edu.travel.tenant.dto.BannerDto;
+import edu.travel.tenant.entity.ShopBanner;
 import edu.travel.tenant.service.ShopBannerService;
 import edu.travel.tenant.vo.BannerVo;
 import edu.travel.web.BaseController;
@@ -19,7 +20,7 @@ import java.util.List;
 */
 @RestController
 @RequestMapping("/shopBanner")
-public class ShopBannerController extends BaseController{
+public class ShopBannerController extends BaseController<ShopBanner>{
 /**
 * 服务对象
 */