3.7

src/main/java/com/gogirl/application/order/serve/ScheduleManageService.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.order.serve.ScheduleManage;
 import com.gogirl.domain.order.serve.ScheduleServe;
 import com.gogirl.domain.store.store.StoreTechnician;
-import com.gogirl.dto.LeisureScheduleServeQuery;
-import com.gogirl.dto.LeisureScheduleServeResp;
 import com.gogirl.shared.order.*;
+import com.gogirl.shared.product.LeisureScheduleServeQuery;
+import com.gogirl.shared.product.LeisureScheduleServeResp;
 
 import java.text.ParseException;
 import java.time.LocalDateTime;
@@ -48,7 +48,6 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      */
     void cancelSchedule(CancelScheduleCommand cmd);
 
-
     /**
      * 不知道
      *
@@ -58,8 +57,7 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      * @param orderId       订单id
      * @return list
      */
-    List<ScheduleServe> listScheduleServeNotContainOrderId(String startDateTime, String endDateTime, Integer departmentId, Integer orderId);//xcx
-
+    List<ScheduleServe> listScheduleServeNotContainOrderId(String startDateTime, String endDateTime, Integer departmentId, Integer orderId);
 
     /**
      * 更新预约状态
@@ -69,7 +67,6 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      */
     void updateScheduledServeStatus(Integer scheduleServeId, Integer status, Integer forceLeisureConfig);
 
-
     /**
      * 美甲师接单前检查预约
      *
@@ -100,7 +97,6 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      */
     void checkBeforeUpdate(UpdateScheduleCommand cmd);
 
-
     /**
      * 店员获取时间列表
      *
@@ -113,7 +109,6 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      */
     List<Map<String, Object>> queryReservableTime(String startDate, Integer lengthTime, Integer departmentId, Integer orderId, Boolean needRemoveOldServe);
 
-
     /**
      * 查询预约聚合
      *

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

@@ -23,8 +23,6 @@ import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreManage;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.user.customer.Customer;
-import com.gogirl.dto.LeisureScheduleServeQuery;
-import com.gogirl.dto.LeisureScheduleServeResp;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.CloneUtil;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -46,6 +44,8 @@ import com.gogirl.infrastructure.service.push.TechnicianPushService;
 import com.gogirl.infrastructure.util.MapDistanceUtils;
 import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.order.*;
+import com.gogirl.shared.product.LeisureScheduleServeQuery;
+import com.gogirl.shared.product.LeisureScheduleServeResp;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -92,7 +92,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     /**
      * rpc service
      */
-
     private final GogirlProperties gogirlProperties;
     private final ScheduleManageMapper scheduleManageMapper;
     private final ScheduleServeService scheduleServeService;
@@ -717,23 +716,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 });
     }
 
-    private boolean isLeisureTime(String time, Long timeSeconds, Integer serveId) throws ParseException {
-
-        Date date = new Date(timeSeconds);
-
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        int weekday = c.get(Calendar.DAY_OF_WEEK);
-        if (weekday == 1) {
-            weekday = 7;
-        } else {
-            weekday = weekday - 1;
-        }
-
-        List<LeisureDiscountConfig> leisureDiscountConfigList = leisureDiscountConfigMapper.selectIsLeisureTime(time, serveId, weekday);
-        return ListUtil.isNotEmpty(leisureDiscountConfigList);
-    }
-
     /**
      * 店铺短码-服务短码（s）-美甲师短码-时间-4位最大单号
      *
@@ -768,7 +750,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 latestOfDayString;
     }
 
-    private void validSubmit(ScheduleManage scheduleManage) throws ParseException, ExecutionException, InterruptedException {
+    private void validSubmit(ScheduleManage scheduleManage) {
 
         /*用户提交 更新预约校验*/
         if (SessionUtils.isSourceFromCustomer()) {
@@ -841,7 +823,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         }
     }
 
-
     /**
      * ScheduleManageServiceImpl
      * 通过ScheduleServe构建TreeProgram
@@ -889,7 +870,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     }
 
     @Override
-    public void submitSchedule(SubmitScheduleCommand cmd) throws ParseException, ExecutionException, InterruptedException {
+    public void submitSchedule(SubmitScheduleCommand cmd) {
         /*1、校验*/
         cmd.getScheduleManageDTO().setScheduledUser(SessionUtils.getCustomerId());
         //参数补全
@@ -920,7 +901,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     }
 
     @Override
-    public void updateSchedule(SubmitScheduleCommand cmd) throws ParseException, ExecutionException, InterruptedException {
+    public void updateSchedule(SubmitScheduleCommand cmd) {
 
         log.info("更新预约:{}", cmd);
 

src/main/java/com/gogirl/application/store/career/ITechScoreRulesService.java

@@ -2,7 +2,7 @@ package com.gogirl.application.store.career;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.store.career.TechScoreRules;
-import com.gogirl.dto.TechScoreResp;
+import com.gogirl.shared.store.TechScoreResp;
 
 /**
  * <p>

src/main/java/com/gogirl/application/store/career/impl/TechScoreRulesServiceImpl.java

@@ -3,15 +3,15 @@ package com.gogirl.application.store.career.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.store.career.ITechScoreRulesService;
 import com.gogirl.domain.store.career.TechScoreRules;
-import com.gogirl.dto.TechScoreResp;
-import com.gogirl.dto.admin.AchievementsPersonaResult;
-import com.gogirl.dto.admin.AchievementsPersonaResultPageApiRequest;
-import com.gogirl.dto.admin.AdminPage;
-import com.gogirl.dto.admin.AdminResult;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.store.career.CareerMapper;
 import com.gogirl.infrastructure.mapper.store.career.TechScoreRulesMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.admin.AchievementsPersonaResult;
+import com.gogirl.shared.admin.AchievementsPersonaResultPageApiRequest;
+import com.gogirl.shared.admin.AdminPage;
+import com.gogirl.shared.admin.AdminResult;
+import com.gogirl.shared.store.TechScoreResp;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

src/main/java/com/gogirl/application/store/store/StoreClassesTechnicianService.java

@@ -4,7 +4,7 @@ package com.gogirl.application.store.store;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreTechnician;
-import com.gogirl.dto.UpdateDayTechnicianClassesReq;
+import com.gogirl.shared.store.UpdateDayTechnicianClassesReq;
 
 import java.text.ParseException;
 import java.util.Date;

src/main/java/com/gogirl/application/store/store/impl/StoreClassesTechnicianServiceImpl.java

@@ -10,7 +10,6 @@ import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.domain.xcx.SysLog;
-import com.gogirl.dto.UpdateDayTechnicianClassesReq;
 import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.store.store.StoreClassesMapper;
@@ -18,6 +17,7 @@ import com.gogirl.infrastructure.mapper.store.store.StoreClassesTechnicianMapper
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.infrastructure.mapper.xcx.SysLogMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.store.UpdateDayTechnicianClassesReq;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/gogirl/application/user/customer/CustomerService.java

@@ -3,7 +3,7 @@ package com.gogirl.application.user.customer;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.domain.user.customer.CustomerDetail;
-import com.gogirl.dto.customer.CustomerOrderDetail;
+import com.gogirl.shared.member.CustomerOrderDetail;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.util.List;

src/main/java/com/gogirl/application/user/customer/impl/CustomerServiceImpl.java

@@ -19,7 +19,6 @@ import com.gogirl.domain.user.customer.CustomerBalance;
 import com.gogirl.domain.user.customer.CustomerDetail;
 import com.gogirl.domain.xcx.GogirlConfig;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.dto.customer.CustomerOrderDetail;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
@@ -35,6 +34,7 @@ import com.gogirl.infrastructure.mapper.xcx.GogirlConfigMapper;
 import com.gogirl.infrastructure.util.WxUtils;
 import com.gogirl.infrastructure.util.lock.Openid1Lock;
 import com.gogirl.shared.member.Code2SessionResult;
+import com.gogirl.shared.member.CustomerOrderDetail;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;

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

@@ -17,7 +17,6 @@ public class ApplyTakeLeaveCommandAssembler implements Function<ApplyTakeLeaveCo
         takeLeaveEvent.setStartTime(applyTakeLeaveCommand.getStartTime().getTime());
         takeLeaveEvent.setEndTime(applyTakeLeaveCommand.getEndTime().getTime());
 
-//        takeLeaveEvent.setTimeLength(applyTakeLeaveCommand.getTimeLength() * 60 * 60 * 1000L);
         takeLeaveEvent.setTimeLength(applyTakeLeaveCommand.getTimeLength());
 
         return takeLeaveEvent;

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

-package com.gogirl.assembler;
-
-import com.gogirl.domain.store.career.Career;
-import com.gogirl.shared.store.CareerDTO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.function.Function;
-
-@Component
-public class CareerDTOAssembler implements Function<Career, CareerDTO> {
-    @Override
-    public CareerDTO apply(Career career) {
-        CareerDTO careerDTO = new CareerDTO();
-        BeanUtils.copyProperties(career, careerDTO);
-        return careerDTO;
-    }
-}

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

@@ -12,7 +12,6 @@ import java.util.function.Function;
 @AllArgsConstructor
 public class MallProductDTOAssembler implements Function<MallProduct, MallProductDTO> {
 
-    private final MallShoppingCartDTOAssembler.PurchaseSkuDTOAssembler purchaseSkuDTOAssembler;
 
     @Override
     public MallProductDTO apply(MallProduct mallProduct) {

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

@@ -19,7 +19,6 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
     private final ScheduleManageDTOAssembler scheduleManageDTOAssembler;
 
     private final CouponCustomerRelevanceDTOAssembler couponCustomerRelevanceDTOAssembler;
-    private final TimesCardCustomerRelevanceDTOAssembler timesCardCustomerRelevanceDTOAssembler;
     private final TimesCardUsedRecordDTOAssembler timesCardUsedRecordDTOAssembler;
 
     @Override

src/main/java/com/gogirl/dto/IdleTimeServeQuery.java

-package com.gogirl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gogirl.domain.product.serve.BaseProduce;
-import com.gogirl.domain.product.serve.BaseServe;
-import com.gogirl.domain.store.store.StoreTechnician;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class IdleTimeServeQuery {
-    private Integer id;
-
-    @ApiModelProperty("预约id")
-    private Integer schId;
-
-    @ApiModelProperty("预约美甲师id")
-    private Integer technicianId;
-
-    @ApiModelProperty("预约服务id")
-    private Integer serveId;
-
-    @ApiModelProperty("主服务id")
-    private Integer mainServeId;
-
-    @ApiModelProperty("0系统分配美甲师.1.客户指定美甲师")
-    private Boolean isCustomerPick = false;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("开始时间")
-    private Date startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("结束时间")
-    private Date endTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("样式名称")
-    private String produceName;
-
-    @ApiModelProperty("服务数量")
-    private Integer serveNumber;
-
-    @ApiModelProperty("预约款式id")
-    private Integer produceId;
-
-    @ApiModelProperty("创建用户")
-    private String createUser;
-
-
-    /**
-     * 非数据库字段
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("款式对象实体")
-    private BaseProduce produce;
-
-    @TableField(exist = false)
-    @ApiModelProperty("用于根据前端传过来开始时间计算结束时间")
-    private Integer lengthTimeForEndTime;
-
-    @TableField(exist = false)
-    @ApiModelProperty("服务实体")
-    private BaseServe serve;
-
-    @TableField(exist = false)
-    @ApiModelProperty("美甲师实体")
-    private StoreTechnician technicianManage;
-
-    @TableField(exist = false)
-    @ApiModelProperty("id")
-    private Map<Integer, StoreTechnician> mapTechnicianManage;
-
-
-    @ApiModelProperty("记录类型 0#修改 1#增加 2#删除 3#原始数据  修改时传递数据是增加还是修改")
-    @TableField(exist = false)
-    private Integer recordType = 0;
-
-    @TableField(exist = false)
-    @ApiModelProperty("服务分类")
-    private String serveType;
-
-    @TableField(exist = false)
-    @ApiModelProperty("服务名称")
-    private String serveName;
-
-    @TableField(exist = false)
-    @ApiModelProperty("是否需要卸甲卸睫毛")
-    private Boolean needRemoveOldServe;
-
-    @TableField(exist = false)
-    @ApiModelProperty("")
-    private List<LinkedHashMap> listTechnician;
-
-    @TableField(exist = false)
-    @ApiModelProperty("")
-    private BigDecimal serveChangePrice;
-}

src/main/java/com/gogirl/infrastructure/common/base/PageReq.java → src/main/java/com/gogirl/infrastructure/common/base/PageRequest.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * @date 2019-06-14
  */
 @Data
-public class PageReq {
+public class PageRequest {
     /**
      * 当前页
      */

src/main/java/com/gogirl/infrastructure/interceptor/LoginHandlerInterceptor.java

@@ -6,7 +6,6 @@ import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
-import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -23,7 +22,6 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
 
     private final GogirlTokenService gogirlTokenService;
     private final StoreManageMapper storeManageMapper;
-    private final CustomerMapper customerMapper;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -38,18 +36,14 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
         if (sourceFrom == null) {
             return true;
         }
+
         if (sourceFrom.equals("customer")) {
             GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
             if (gogirlToken == null) {
                 throw new RRException(2000, "token失效，请重新登陆");
             }
-//            else {
-//                Customer customer = customerMapper.selectById(gogirlToken.getCustomerId());
-//                if (customer != null && StringUtils.isEmpty(customer.getPhone())) {
-//                    throw new RRException(1001, "请授权手机号码");
-//                }
-//            }
         }
+
         if (sourceFrom.equals("technician")) {
             GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
             if (gogirlToken == null) {

src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleManageMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gogirl.domain.order.serve.ScheduleManage;
 import com.gogirl.domain.order.serve.ScheduleServe;
-import com.gogirl.dto.LeisureScheduleServeResp;
+import com.gogirl.shared.product.LeisureScheduleServeResp;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

src/main/java/com/gogirl/infrastructure/service/push/impl/TechnicianPushServiceImpl.java

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gogirl.domain.order.serve.ScheduleManage;
 import com.gogirl.domain.order.serve.ScheduleServe;
 import com.gogirl.domain.store.store.StoreTechnician;
-import com.gogirl.dto.EnterpriseWxMsg;
 import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleServeMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.infrastructure.service.push.TechnicianPushService;
+import com.gogirl.shared.store.EnterpriseWxMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

src/main/java/com/gogirl/interfaces/order/mall/MallOrderController.java

@@ -7,7 +7,7 @@ import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.order.mall.MallOrder;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.util.SessionUtils;
-import com.gogirl.shared.market.ListMallOrderReq;
+import com.gogirl.shared.market.ListMallOrderRequest;
 import com.gogirl.shared.market.SubmitMallOrderCommand;
 import com.gogirl.shared.member.ImmediatePurchaseCommand;
 import com.gogirl.shared.order.CancelMallOrderCommand;
@@ -63,13 +63,13 @@ public class MallOrderController {
     @ApiOperation("我的订单列表")
     @PostMapping("/customer/mallOrder/listMallOrderAggregate")
     public JsonResult<IPage<MallOrder>> listMallOrderAggregate(@RequestHeader String token,
-                                                               @RequestBody ListMallOrderReq reqDTO) {
+                                                               @RequestBody ListMallOrderRequest reqDTO) {
         Integer currentCustomerId = SessionUtils.getCustomerId();
         Page<MallOrder> page = new Page<>();
         page.setCurrent(reqDTO.getPageIndex());
         page.setSize(reqDTO.getPageSize());
 
-        MallOrder mallOrder = ListMallOrderReq.convertToMallOrder(reqDTO);
+        MallOrder mallOrder = ListMallOrderRequest.convertToMallOrder(reqDTO);
         mallOrder.setCustomerId(currentCustomerId);
         IPage<MallOrder> data = mallOrderService.listMallOrderAggregate(page, mallOrder);
         return JsonResult.success(data);

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

@@ -14,9 +14,6 @@ import com.gogirl.domain.order.serve.ScheduleManage;
 import com.gogirl.domain.product.serve.BaseProduce;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.dto.LeisureScheduleServeQuery;
-import com.gogirl.dto.LeisureScheduleServeResp;
-import com.gogirl.dto.QueryLeisureTechnicianReq;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -27,7 +24,10 @@ import com.gogirl.infrastructure.util.lock.CustomerIdLock;
 import com.gogirl.infrastructure.util.lock.ScheduleServeIdLock;
 import com.gogirl.infrastructure.util.lock.ScheduledLock;
 import com.gogirl.shared.order.*;
+import com.gogirl.shared.product.LeisureScheduleServeQuery;
+import com.gogirl.shared.product.LeisureScheduleServeResp;
 import com.gogirl.shared.product.PurchaseSkuDTO;
+import com.gogirl.shared.product.QueryLeisureTechnicianReq;
 import com.gogirl.shared.user.VipServeQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/gogirl/interfaces/product/serve/ProduceController.java

@@ -3,8 +3,8 @@ package com.gogirl.interfaces.product.serve;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gogirl.application.product.serve.BaseProduceService;
 import com.gogirl.domain.product.serve.BaseProduce;
-import com.gogirl.dto.QueryProduceDetailResp;
 import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.shared.product.QueryProduceDetailResp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/gogirl/interfaces/store/career/CareerController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gogirl.application.store.store.CareerCmdService;
 import com.gogirl.application.store.store.StoreDataService;
 import com.gogirl.application.xcx.GogirlTokenService;
-import com.gogirl.assembler.CareerDTOAssembler;
 import com.gogirl.assembler.TrainingStartClassDTOAssembler;
 import com.gogirl.assembler.WorksAssembler;
 import com.gogirl.domain.order.serve.OrderServe;
@@ -30,13 +29,7 @@ import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassLogTech
 import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceRecordMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
-import com.gogirl.shared.store.SignUpTrainingCommand;
-import com.gogirl.shared.store.SubmitFeedbackCommand;
-import com.gogirl.shared.store.SubmitWorksCommand;
-import com.gogirl.shared.store.TrainingStartClassDTO;
-import com.gogirl.shared.store.WorksDTO;
-import com.gogirl.shared.store.TrainingStartClassQuery;
-import com.gogirl.shared.store.WorksQuery;
+import com.gogirl.shared.store.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -89,7 +82,6 @@ public class CareerController {
     }
 
     private final WorksAssembler worksAssembler;
-    private final CareerDTOAssembler careerDTOAssembler;
 
     @ApiOperation("报名技能培训")
     @PostMapping("/technician/career/signUpTraining")

src/main/java/com/gogirl/interfaces/store/career/TechScoreRulesController.java

@@ -2,8 +2,8 @@ package com.gogirl.interfaces.store.career;
 
 
 import com.gogirl.application.store.career.ITechScoreRulesService;
-import com.gogirl.dto.TechScoreResp;
 import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.shared.store.TechScoreResp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/gogirl/interfaces/store/complaint/TestPaperController.java

@@ -4,9 +4,9 @@ import com.gogirl.application.user.investigation.BaseQuestionService;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.user.investigation.BaseQuestion;
 import com.gogirl.domain.user.investigation.OrderQuestionOption;
-import com.gogirl.dto.SubmitTestPaperReq;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
+import com.gogirl.shared.store.SubmitTestPaperReq;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/gogirl/interfaces/store/shop/ClassesTechnicianController.java

@@ -8,11 +8,11 @@ import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.dto.UpdateDayTechnicianClassesReq;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.mapper.store.store.StoreClassesTechnicianMapper;
 import com.gogirl.infrastructure.mapper.xcx.SysLogMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.store.UpdateDayTechnicianClassesReq;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/gogirl/interfaces/user/CustomerController.java

@@ -2,9 +2,9 @@ package com.gogirl.interfaces.user;
 
 import com.gogirl.application.user.customer.CustomerService;
 import com.gogirl.domain.user.customer.Customer;
-import com.gogirl.dto.customer.CustomerOrderDetail;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.service.file.FileService;
+import com.gogirl.shared.member.CustomerOrderDetail;
 import com.gogirl.shared.user.CustomerQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/gogirl/dto/admin/AchievementsPersonaResult.java → src/main/java/com/gogirl/shared/admin/AchievementsPersonaResult.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import lombok.Data;
 

src/main/java/com/gogirl/dto/admin/AchievementsPersonaResultPageApiRequest.java → src/main/java/com/gogirl/shared/admin/AchievementsPersonaResultPageApiRequest.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/gogirl/dto/admin/AdminPage.java → src/main/java/com/gogirl/shared/admin/AdminPage.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import lombok.Data;
 

src/main/java/com/gogirl/dto/admin/AdminResult.java → src/main/java/com/gogirl/shared/admin/AdminResult.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import lombok.Data;
 

src/main/java/com/gogirl/dto/admin/AdminTechnicianScore.java → src/main/java/com/gogirl/shared/admin/AdminTechnicianScore.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/gogirl/dto/admin/GetTechnicianPageRequest.java → src/main/java/com/gogirl/shared/admin/GetTechnicianPageRequest.java

-package com.gogirl.dto.admin;
+package com.gogirl.shared.admin;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/gogirl/shared/market/ListMallOrderReq.java → src/main/java/com/gogirl/shared/market/ListMallOrderRequest.java

 package com.gogirl.shared.market;
 
 import com.gogirl.domain.order.mall.MallOrder;
-import com.gogirl.infrastructure.common.base.PageReq;
+import com.gogirl.infrastructure.common.base.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel("订单列表查询参数")
-public class ListMallOrderReq extends PageReq {
+public class ListMallOrderRequest extends PageRequest {
 
     @ApiModelProperty("订单类型 1-订单待付款 2-订单已付款 3-订单已发货 4-订单已签收")
     private Integer status;
 
 
-    public static MallOrder convertToMallOrder(ListMallOrderReq reqDTO) {
+    public static MallOrder convertToMallOrder(ListMallOrderRequest reqDTO) {
         MallOrder mallOrder = new MallOrder();
         mallOrder.setStatus(reqDTO.getStatus());
         return mallOrder;

src/main/java/com/gogirl/dto/customer/CustomerOrderDetail.java → src/main/java/com/gogirl/shared/member/CustomerOrderDetail.java

-package com.gogirl.dto.customer;
+package com.gogirl.shared.member;
 
 import com.gogirl.domain.order.serve.OrderManage;
 import com.gogirl.domain.user.customer.Customer;

src/main/java/com/gogirl/shared/order/OrderManageDTO.java

@@ -114,7 +114,6 @@ public class OrderManageDTO {
 
     private String afterSaleBuyCardReason;
 
-
     @ApiModelProperty("订单详情")
     private List<OrderServeDTO> orderServeDTOList;
 

src/main/java/com/gogirl/dto/LeisureScheduleServeQuery.java → src/main/java/com/gogirl/shared/product/LeisureScheduleServeQuery.java

-package com.gogirl.dto;
+package com.gogirl.shared.product;
 
 import lombok.Data;
 

src/main/java/com/gogirl/dto/LeisureScheduleServeResp.java → src/main/java/com/gogirl/shared/product/LeisureScheduleServeResp.java

-package com.gogirl.dto;
+package com.gogirl.shared.product;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gogirl.domain.store.store.StoreTechnician;

src/main/java/com/gogirl/dto/QueryLeisureTechnicianReq.java → src/main/java/com/gogirl/shared/product/QueryLeisureTechnicianReq.java

-package com.gogirl.dto;
+package com.gogirl.shared.product;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/gogirl/dto/QueryProduceDetailResp.java → src/main/java/com/gogirl/shared/product/QueryProduceDetailResp.java

-package com.gogirl.dto;
+package com.gogirl.shared.product;
 
 import com.gogirl.domain.product.serve.BaseProduce;
 import com.gogirl.domain.product.serve.BaseServe;

src/main/java/com/gogirl/dto/EnterpriseWxMsg.java → src/main/java/com/gogirl/shared/store/EnterpriseWxMsg.java

-package com.gogirl.dto;
+package com.gogirl.shared.store;
 
 import lombok.Data;
 

src/main/java/com/gogirl/dto/SubmitBaseQuestionReq.java → src/main/java/com/gogirl/shared/store/SubmitBaseQuestionReq.java

-package com.gogirl.dto;
+package com.gogirl.shared.store;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/gogirl/dto/SubmitTestPaperReq.java → src/main/java/com/gogirl/shared/store/SubmitTestPaperReq.java

-package com.gogirl.dto;
+package com.gogirl.shared.store;
 
 import com.gogirl.domain.user.investigation.OrderQuestionOption;
 import lombok.Data;

src/main/java/com/gogirl/dto/TechScoreResp.java → src/main/java/com/gogirl/shared/store/TechScoreResp.java

-package com.gogirl.dto;
+package com.gogirl.shared.store;
 
 import com.gogirl.domain.store.career.TechScoreRules;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/gogirl/dto/UpdateDayTechnicianClassesReq.java → src/main/java/com/gogirl/shared/store/UpdateDayTechnicianClassesReq.java

-package com.gogirl.dto;
+package com.gogirl.shared.store;
 
 
 import com.gogirl.domain.store.store.StoreTechnician;

src/main/resources/mapper/order/ScheduleManageMapper.xml

@@ -206,7 +206,7 @@
           and TO_DAYS(t1.start_time) = TO_DAYS(NOW())
           and t2.id != #{scheduleId}
     </select>
-    <select id="queryPageLeisureScheduleServe" resultType="com.gogirl.dto.LeisureScheduleServeResp">
+    <select id="queryPageLeisureScheduleServe" resultType="com.gogirl.shared.product.LeisureScheduleServeResp">
         SELECT t1.id as leisure_discount_config_id,
         t1.discount_rate,
         t1.department_id,