Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WeChatController.java

@@ -30,7 +30,7 @@ import com.ylx.framework.manager.factory.AsyncFactory;
 import com.ylx.framework.web.service.WxTokenService;
 import com.ylx.massage.domain.TJs;
 import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponReceiveService;
 import com.ylx.massage.service.TJsService;
 import com.ylx.massage.service.TWxUserService;
 import com.ylx.massage.service.TbFileService;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WeSqController.java

@@ -1,26 +1,19 @@
 package com.ylx.web.controller.massage;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
-import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ylx.common.annotation.Log;
 import com.ylx.common.constant.Constants;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
-import com.ylx.common.enums.BusinessType;
 import com.ylx.common.utils.MessageUtils;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.framework.manager.AsyncManager;
 import com.ylx.framework.manager.factory.AsyncFactory;
 import com.ylx.framework.web.service.WxTokenService;
-import com.ylx.massage.domain.CouponReceive;
-import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponReceiveService;
 import com.ylx.massage.service.IMaTechnicianService;
 import com.ylx.massage.service.TWxUserService;
 import com.ylx.massage.utils.VirtualTechnicianNicknameGenerator;
@@ -28,11 +21,9 @@ import com.ylx.massage.utils.WeChatUtil;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WxController.java

@@ -24,21 +24,14 @@ import com.ylx.framework.config.ServerConfig;
 import com.ylx.framework.manager.AsyncManager;
 import com.ylx.framework.manager.factory.AsyncFactory;
 import com.ylx.framework.web.service.WxTokenService;
-import com.ylx.giftCard.domain.dto.UserShoppingFundsDetailQueryDTO;
-import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailItemVO;
-import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailVO;
-import com.ylx.giftCard.service.IGiftCardOrderService;
 import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.domain.dto.QueryWxUserDTO;
 import com.ylx.massage.domain.vo.TWxUserVo;
-import com.ylx.massage.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponReceiveService;
 import com.ylx.massage.service.TWxUserService;
 import com.ylx.massage.service.TbFileService;
 import com.ylx.massage.utils.WxQrCodeUtil;
 import com.ylx.massage.utils.WxUtil;
-import com.ylx.point.domain.dto.UserPointDetailQueryDTO;
-import com.ylx.point.domain.vo.UserPointDetailVO;
-import com.ylx.point.service.IPointUserLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/CouponController.java → nightFragrance-massage/src/main/java/com/ylx/coupon/controller/CouponController.java

@@ -1,4 +1,4 @@
-package com.ylx.web.controller.massage;
+package com.ylx.coupon.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,8 +8,8 @@ import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.utils.StringUtils;
-import com.ylx.massage.domain.Coupon;
-import com.ylx.massage.service.CouponService;
+import com.ylx.coupon.domain.Coupon;
+import com.ylx.coupon.service.CouponService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/CouponReceiveController.java → nightFragrance-massage/src/main/java/com/ylx/coupon/controller/CouponReceiveController.java

@@ -1,18 +1,18 @@
-package com.ylx.web.controller.massage;
+package com.ylx.coupon.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
 import com.ylx.common.enums.BusinessType;
-import com.ylx.massage.domain.Coupon;
-import com.ylx.massage.domain.CouponReceive;
+import com.ylx.coupon.domain.Coupon;
+import com.ylx.coupon.domain.CouponReceive;
 import com.ylx.common.core.domain.R;
 import com.ylx.massage.domain.vo.ClaimCouponRequestVO;
 import com.ylx.massage.domain.vo.CouponReceiveVo;
 import com.ylx.massage.domain.vo.CouponReceivesVO;
 import com.ylx.massage.domain.vo.ShareVolutionDetailVO;
-import com.ylx.massage.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponReceiveService;
 import com.ylx.massage.service.ShareVolutionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Coupon.java → nightFragrance-massage/src/main/java/com/ylx/coupon/domain/Coupon.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain;
+package com.ylx.coupon.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/CouponReceive.java → nightFragrance-massage/src/main/java/com/ylx/coupon/domain/CouponReceive.java

@@ -1,13 +1,8 @@
-package com.ylx.massage.domain;
+package com.ylx.coupon.domain;
 import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 /**

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/CouponMapper.java → nightFragrance-massage/src/main/java/com/ylx/coupon/mapper/CouponMapper.java

@@ -1,8 +1,8 @@
-package com.ylx.massage.mapper;
+package com.ylx.coupon.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ylx.massage.domain.Coupon;
+import com.ylx.coupon.domain.Coupon;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/CouponReceiveMapper.java → nightFragrance-massage/src/main/java/com/ylx/coupon/mapper/CouponReceiveMapper.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.mapper;
+package com.ylx.coupon.mapper;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -7,8 +7,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.massage.domain.vo.CouponReceiveVo;
 import org.apache.ibatis.annotations.Param;
-import com.ylx.massage.domain.CouponReceive;
-import org.apache.ibatis.annotations.Select;
+import com.ylx.coupon.domain.CouponReceive;
 
 /**
  * 优惠券领取表(CouponReceive)表数据库访问层

nightFragrance-massage/src/main/java/com/ylx/massage/service/CouponReceiveService.java → nightFragrance-massage/src/main/java/com/ylx/coupon/service/CouponReceiveService.java

@@ -1,9 +1,9 @@
-package com.ylx.massage.service;
+package com.ylx.coupon.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.common.core.domain.R;
-import com.ylx.massage.domain.Coupon;
-import com.ylx.massage.domain.CouponReceive;
+import com.ylx.coupon.domain.Coupon;
+import com.ylx.coupon.domain.CouponReceive;
 import com.ylx.massage.domain.vo.ClaimCouponRequestVO;
 import com.ylx.massage.domain.vo.CouponReceiveVo;
 import com.ylx.massage.domain.vo.CouponReceivesVO;

nightFragrance-massage/src/main/java/com/ylx/massage/service/CouponService.java → nightFragrance-massage/src/main/java/com/ylx/coupon/service/CouponService.java

@@ -1,8 +1,8 @@
-package com.ylx.massage.service;
+package com.ylx.coupon.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ylx.massage.domain.Coupon;
+import com.ylx.coupon.domain.Coupon;
 
 import java.math.BigDecimal;
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/CouponReceiveServiceImpl.java → nightFragrance-massage/src/main/java/com/ylx/coupon/service/impl/CouponReceiveServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.service.impl;
+package com.ylx.coupon.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
-import com.ylx.massage.domain.Coupon;
+import com.ylx.coupon.domain.Coupon;
 import com.ylx.massage.domain.UserCouponRelation;
 import com.ylx.massage.domain.vo.ClaimCouponRequestVO;
 import com.ylx.massage.domain.vo.CouponReceiveVo;
 import com.ylx.massage.domain.vo.CouponReceivesVO;
-import com.ylx.massage.mapper.CouponReceiveMapper;
-import com.ylx.massage.domain.CouponReceive;
+import com.ylx.coupon.mapper.CouponReceiveMapper;
+import com.ylx.coupon.domain.CouponReceive;
 import com.ylx.massage.mapper.UserCouponRelationMapper;
-import com.ylx.massage.service.CouponReceiveService;
-import com.ylx.massage.service.CouponService;
+import com.ylx.coupon.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponService;
 import com.ylx.massage.utils.DateTimeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/CouponServiceImpl.java → nightFragrance-massage/src/main/java/com/ylx/coupon/service/impl/CouponServiceImpl.java

@@ -1,15 +1,13 @@
-package com.ylx.massage.service.impl;
+package com.ylx.coupon.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.ServiceException;
-import com.ylx.massage.domain.Coupon;
-import com.ylx.massage.domain.CouponReceive;
-import com.ylx.massage.mapper.CouponMapper;
-import com.ylx.massage.service.CouponReceiveService;
-import com.ylx.massage.service.CouponService;
+import com.ylx.coupon.domain.Coupon;
+import com.ylx.coupon.mapper.CouponMapper;
+import com.ylx.coupon.service.CouponReceiveService;
+import com.ylx.coupon.service.CouponService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +17,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Map;
 
 /**

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/CouponReceiveVo.java

@@ -1,13 +1,9 @@
 package com.ylx.massage.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ylx.massage.domain.Coupon;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/MerchantOrderDetailVO.java

@@ -1,11 +1,13 @@
 package com.ylx.order.domain.vo.merchant;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ylx.order.service.IAfterSaleDisplay;
 import com.ylx.order.service.IGeoRiskInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
@@ -41,10 +43,12 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
     private BigDecimal finalAmount;
 
     @ApiModelProperty("预约开始时间")
-    private String appointmentStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime appointmentStartTime;
 
     @ApiModelProperty("预约结束时间")
-    private String appointmentEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime appointmentEndTime;
 
     @ApiModelProperty("预约时间范围（格式化，示例：5月12日 16:00-18:00）")
     private String appointmentTimeRange;
@@ -74,10 +78,16 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
     private String orderId;
 
     @ApiModelProperty("下单时间")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 
     @ApiModelProperty("付款时间")
-    private String paidTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime paidTime;
+
+    @ApiModelProperty("服务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime completedTime;
 
     @ApiModelProperty("售后单ID")
     private Long afterSalesServiceId;

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -25,7 +25,7 @@ import com.ylx.massage.domain.TGeoFence;
 import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.mapper.MaProjectMapper;
 import com.ylx.massage.mapper.MaTechnicianMapper;
-import com.ylx.massage.service.CouponService;
+import com.ylx.coupon.service.CouponService;
 import com.ylx.massage.service.IMaTechnicianService;
 import com.ylx.massage.service.TGeoFenceService;
 import com.ylx.massage.service.TWxUserService;

nightFragrance-massage/src/main/resources/mapper/massage/CouponMapper.xml → nightFragrance-massage/src/main/resources/mapper/coupon/CouponMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ylx.massage.mapper.CouponMapper">
+<mapper namespace="com.ylx.coupon.mapper.CouponMapper">
 
-    <resultMap type="com.ylx.massage.domain.Coupon" id="CouponMap">
+    <resultMap type="com.ylx.coupon.domain.Coupon" id="CouponMap">
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="INTEGER"/>

nightFragrance-massage/src/main/resources/mapper/massage/CouponReceiveMapper.xml → nightFragrance-massage/src/main/resources/mapper/coupon/CouponReceiveMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ylx.massage.mapper.CouponReceiveMapper">
+<mapper namespace="com.ylx.coupon.mapper.CouponReceiveMapper">
 
     <resultMap id="CouponReceiveVoMap" type="com.ylx.massage.domain.vo.CouponReceiveVo">
         <result property="id" column="id" jdbcType="VARCHAR"/>