商家端预约管理优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDTO.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,6 +42,10 @@ public class OmsOrderDTO implements Serializable
 
     /** 用户帐号 */
     private String memberUsername;
+    /**
+     *用户头像
+     */
+    private String  avatar;
 
     /** 订单总金额 */
     private BigDecimal totalAmount;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/MerchantAuthModifyParam.java

@@ -100,8 +100,10 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 店铺地址
      */
-    @Size(max = 255, message = "店铺地址长度不能大于255")
-    private String storeAddress;
+    @NotNull(message = "所属地区不能为空")
+    @Min(value = 100000, message = "所属地区不能小于100000")
+    @Max(value = 999999, message = "所属地区不能大于999999")
+    private Integer storeAddress;
     /**
      * 经营许可证照片
      */
@@ -161,13 +163,6 @@ public class MerchantAuthModifyParam implements Serializable {
     @NotEmpty(message = "营业时间不能为空")
     @Size(max = 50, message = "营业时间长度不能大于50")
     private String opening;
-    /**
-     * 所属地区
-     */
-    @NotNull(message = "所属地区不能为空")
-    @Min(value = 100000, message = "所属地区不能小于100000")
-    @Max(value = 999999, message = "所属地区不能大于999999")
-    private Integer region;
 
     /**
      * 省

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/MerchantAuth.java

@@ -43,7 +43,7 @@ public class MerchantAuth implements Entity<Long> {
     private Date accountRegistrationDate; // 账号注册日期
     private String storeType; // 店铺类型
     private String storeName; // 店名
-    private String storeAddress; // 店铺地址
+    private Integer storeAddress; // 店铺地址
     private String businessLicensePhoto; // 经营许可证照片
     private String businessLicenseNumberValid; // 经营许可证号
     private Date businessLicenseExpirationDateValid; // 经营许可证有效期

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -183,10 +183,11 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         Scope scope = StringUtils.ifEmpty(SessionContextHolder.getScope(), Scope::parse);
         if (scope == Scope.ADMIN) {
         }else {
-            List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
-            if (ObjectUtils.isEmpty(merchants)) {
-                return null;
-            }if ("1".equals(param.getType())){
+            if ("1".equals(param.getType())){
+                List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
+                if (ObjectUtils.isEmpty(merchants)) {
+                    return null;
+                }
                 param.setMerchantId(merchants.get(0));
             }
         }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantAuthServiceImpl.java

@@ -63,7 +63,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         param1.setOpening(param.getOpening());
         param1.setProvince(param.getProvince());
         param1.setCity(param.getCity());
-        param1.setRegion(param.getRegion());
+        param1.setRegion(param.getStoreAddress());
         param1.setDistrict(param.getDistrict());
         param1.setLatitude(param.getLatitude());
         param1.setLongitude(param.getLongitude());
@@ -97,7 +97,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         param1.setOpening(param.getOpening());
         param1.setProvince(param.getProvince());
         param1.setCity(param.getCity());
-        param1.setRegion(param.getRegion());
+        param1.setRegion(param.getStoreAddress());
         param1.setDistrict(param.getDistrict());
         param1.setLatitude(param.getLatitude());
         param1.setLongitude(param.getLongitude());

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -2,6 +2,8 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.user.client.UserClient;
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.chelvc.cloud.user.client.model.Scope;
 import com.chelvc.cloud.vehicle.client.dto.*;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
@@ -62,6 +64,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     private final AssessService assessService;
 
+    private final UserClient userService;
+
     @Override
     public ConfirmOrderResultDTO generateConfirmOrder(OmsOrderModifyParam orderParam) {
         ConfirmOrderResultDTO result = new ConfirmOrderResultDTO();
@@ -855,6 +859,11 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
         pagination.getRecords().forEach(item -> {
             item.setGoodsInfo(this.omsOrderItemService.getOrderItemByOrderId(item.getId()));
+            UserDTO user = this.userService.getUser(item.getUserId());
+            if (null != user){
+                item.setAvatar(user.getAvatar());
+                item.setMemberUsername(user.getNickname());
+            }
         });
         return pagination;
     }