标签改成map

deploy.sh

 # shellcheck disable=SC2164
-cd /gogirl/gogirl-minapp-backend
+cd /gogirl/gogirl-miniapp-backend
 mvn clean package -Dmaven.test.skip=true  -Dmaven.compile.fork=true
 
 # shellcheck disable=SC2009
-ps -ef | grep minapp | grep -v grep | awk '{print $2}' | xargs kill -9
+ps -ef | grep miniapp | grep -v grep | awk '{print $2}' | xargs kill -9
 
-nohup java -Xms512m -Xmxm -Xss2048M -jar -Dspring.profiles.active=prod /gogirl/gogirl-minapp-backend/target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar & \
+nohup java -Xms512m -Xmx2048m -Xss2m -jar -Dspring.profiles.active=pre /gogirl/gogirl-miniapp-backend/target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar & \
 
 

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -300,7 +300,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         orderManagePage.getRecords().forEach(orderManage -> {
             orderManage.setListOrderServer(orderServeMap.get(orderManage.getId()));
-            orderManage.setScheduleManage(scheduledManageMap.get(orderManage.getId()).stream().findAny().orElse(null));
+            List<ScheduleManage> list = scheduledManageMap.get(orderManage.getId());
+            if (ListUtil.isNotEmpty(list)) {
+                orderManage.setScheduleManage(list.stream().findAny().orElse(null));
+            }
         });
 
         return orderManagePage;
@@ -628,9 +631,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setListTimesCardRecord(timesCardUsedRecordList);
 
         orderManage.getListOrderServer()
-                .forEach(orderServeDTO -> {
-                    List<String> ids = Lists.newArrayList(orderServeDTO.getTechnicianIds().split(","));
-                    orderServeDTO.setListTechnicianManage(ids
+                .forEach(orderServe -> {
+                    List<String> ids = Lists.newArrayList(orderServe.getTechnicianId().split(","));
+                    orderServe.setListTechnicianManage(ids
                             .stream()
                             .map(Integer::valueOf)
                             .map(storeTechnicianMapper::selectById)

src/main/java/com/gogirl/application/order/serve/impl/OrderManageDTOAssembler.java → src/main/java/com/gogirl/assembler/OrderManageDTOAssembler.java

-package com.gogirl.application.order.serve.impl;
+package com.gogirl.assembler;
 
-import com.gogirl.assembler.ScheduleManageDTOAssembler;
 import com.gogirl.domain.order.serve.*;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.shared.order.serve.query.dto.ScheduleManageDTO;
@@ -45,6 +44,8 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
         private final OrderRecordDTOAssembler orderRecordDTOAssembler;
         private final OrderServeDescribeDTOAssembler orderServeDescribeDTOAssembler;
 
+        private final StoreTechnicianDTOAssembler storeTechnicianDTOAssembler;
+
         @Override
         public OrderServeDTO apply(OrderServe orderServe) {
             OrderServeDTO orderServeDTO = new OrderServeDTO();
@@ -67,6 +68,12 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
                         .map(orderServeSkuDTOAssembler)
                         .collect(Collectors.toList()));
             }
+            if (ListUtil.isNotEmpty(orderServe.getListTechnicianManage())) {
+                orderServeDTO.setStoreTechnicianDTOList(orderServe.getListTechnicianManage()
+                        .stream()
+                        .map(storeTechnicianDTOAssembler)
+                        .collect(Collectors.toList()));
+            }
 
             orderServeDTO.setTechnicianIds(orderServe.getTechnicianId());
             orderServeDTO.setTechnicianNames(orderServe.getTechnicianName());

src/main/java/com/gogirl/assembler/StoreTechnicianDTOAssembler.java

+package com.gogirl.assembler;
+
+import com.gogirl.domain.store.store.StoreTechnician;
+import com.gogirl.shared.store.query.dto.StoreTechnicianDTO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.function.Function;
+
+@Component
+public class StoreTechnicianDTOAssembler implements Function<StoreTechnician, StoreTechnicianDTO> {
+    @Override
+    public StoreTechnicianDTO apply(StoreTechnician storeTechnician) {
+        StoreTechnicianDTO storeTechnicianDTO = new StoreTechnicianDTO();
+        BeanUtils.copyProperties(storeTechnician, storeTechnicianDTO);
+        return storeTechnicianDTO;
+    }
+}

src/main/java/com/gogirl/domain/market/serve/CouponCustomerRelevance.java

@@ -14,6 +14,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -23,7 +24,7 @@ import java.util.Date;
 @NoArgsConstructor
 @TableName("coupon_customer_relevance")
 @Data
-public class CouponCustomerRelevance {
+public class CouponCustomerRelevance implements Serializable {
 
     public static Integer STATE_CHOSE = 1;
     public static Integer STATE_USED = 2;

src/main/java/com/gogirl/interfaces/order/serve/OrderCommentLabelController.java

@@ -33,7 +33,7 @@ public class OrderCommentLabelController {
      * @return 所有评论标签列表
      */
     @ApiOperation(value = "查询所有标签")
-    @GetMapping("queryOrderLabel")
+    @GetMapping("/customer/orderLabel/queryOrderLabel")
     @GogirlMember
     public JsonResult<Map<Integer, List<OrderCommentLabel>>> queryOrderLabel() {
         List<OrderCommentLabel> commentLabelList = orderCommentLabelMapper.selectList(new QueryWrapper<>());

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gogirl.application.order.serve.OrderManageService;
 import com.gogirl.application.order.serve.OrderServeService;
 import com.gogirl.application.order.serve.ScheduleManageService;
-import com.gogirl.application.order.serve.impl.OrderManageDTOAssembler;
+import com.gogirl.assembler.OrderManageDTOAssembler;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.order.serve.OrderComment;
 import com.gogirl.domain.order.serve.OrderManage;