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

nightFragrance-massage/src/main/java/com/ylx/order/controller/OrderController.java

@@ -0,0 +1,35 @@
+package com.ylx.order.controller;
+
+import com.ylx.common.core.domain.R;
+import com.ylx.order.domain.dto.OrderSubmitDTO;
+import com.ylx.order.service.TOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/order")
+@Api(tags = {"订单模块"})
+@Slf4j
+public class OrderController {
+
+    @Resource
+    private TOrderService orderService;
+
+    @PreAuthorize("@customerAuth.isCustomer()")
+    @ApiOperation("客户端用户提交订单")
+    @PostMapping("/submit")
+    public R<?> submitOrder(@Validated @RequestBody OrderSubmitDTO dto) {
+        this.orderService.submitOrder(dto);
+        return R.ok();
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/order/domain/dto/OrderSubmitDTO.java

@@ -0,0 +1,46 @@
+package com.ylx.order.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("客户端提交订单DTO")
+public class OrderSubmitDTO implements Serializable {
+    private static final long serialVersionUID = -4463081409198769872L;
+
+    @NotNull(message = "商户ID不能为空")
+    @ApiModelProperty("商户ID")
+    private Long merchantId;
+
+    @NotNull(message = "项目ID不能为空")
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    @NotNull(message = "预约开始时间不能为空")
+    @ApiModelProperty("预约开始时间")
+    private LocalDateTime appointmentStartTime;
+
+    @NotNull(message = "联系人地址ID不能为空")
+    @ApiModelProperty("联系人地址ID")
+    private Long addressId;
+
+    @ApiModelProperty("优惠券抵扣金额")
+    private BigDecimal couponDiscount;
+
+    @ApiModelProperty("交通费")
+    private BigDecimal trafficFee;
+
+    @NotNull(message = "支付方式不能为空")
+    @ApiModelProperty("支付方式")
+    private Integer paymentMethod;
+
+}

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

@@ -8,6 +8,7 @@ import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.domain.vo.HomeBlock;
 import com.ylx.massage.domain.vo.OrderVerificationVo;
 import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
+import com.ylx.order.domain.dto.OrderSubmitDTO;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -149,4 +150,6 @@ public interface TOrderService extends IService<TOrder> {
      * @return
      */
     public List<Map<String, Object>> myIncomeDetail(TWxUser user, Integer wStatus);
+
+    void submitOrder(OrderSubmitDTO dto);
 }

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

@@ -1,23 +1,38 @@
 package com.ylx.order.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.common.exception.ServiceException;
+import com.ylx.common.utils.DateUtils;
+import com.ylx.common.utils.SecurityUtils;
+import com.ylx.massage.domain.MaTechnician;
+import com.ylx.massage.domain.TAddress;
 import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.domain.vo.HomeBlock;
 import com.ylx.massage.domain.vo.OrderVerificationVo;
 import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
+import com.ylx.massage.service.IMaTechnicianService;
+import com.ylx.massage.service.TAddressService;
+import com.ylx.massage.utils.OrderNumberGenerator;
 import com.ylx.order.domain.TOrder;
+import com.ylx.order.domain.dto.OrderSubmitDTO;
 import com.ylx.order.mapper.TOrderMapper;
 import com.ylx.order.service.TOrderService;
+import com.ylx.project.domain.Project;
+import com.ylx.project.service.ProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
 
 
 /**
@@ -27,6 +42,15 @@ import java.util.Map;
 @Slf4j
 public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService {
 
+    @Resource
+    private ProjectService projectService;
+    @Resource
+    private TAddressService addressService;
+    @Resource
+    private IMaTechnicianService maTechnicianService;
+    @Resource
+    private OrderNumberGenerator orderNumberGenerator;
+
     @Override
     public TOrder addOrder(TOrder order) {
         return null;
@@ -156,4 +180,116 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     public List<Map<String, Object>> myIncomeDetail(TWxUser user, Integer wStatus) {
         return Collections.emptyList();
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submitOrder(OrderSubmitDTO dto) {
+
+        TOrder order = new TOrder();
+        String orderNo = orderNumberGenerator.generateNextOrderNumber("");
+        order.setOrderNo(orderNo);
+
+        // 1. 获取当前用户
+        WxLoginUser wxLoginUser = SecurityUtils.getWxLoginUser();
+        if (ObjectUtil.isNull(wxLoginUser)) {
+            throw new ServiceException("用户未登录");
+        }
+
+        order.setUserId(Long.parseLong(wxLoginUser.getId()));
+
+        // 2. 获取项目信息
+        Project project = this.projectService.getById(dto.getProjectId());
+        if (ObjectUtil.isNull(project)) {
+            throw new ServiceException("项目不存在");
+        }
+
+        order.setProjectId(dto.getProjectId());
+        order.setProjectType(project.getType());
+        order.setProjectName(project.getTitle());
+        order.setProjectCover(project.getCover());
+        order.setHighlight(project.getHighlight());
+        order.setAppointmentStartTime(dto.getAppointmentStartTime());
+        order.setProjectDuration(project.getStandardDuration());
+
+        // 3. 获取商户信息
+        MaTechnician maTechnician = this.maTechnicianService.getById(dto.getMerchantId());
+        if (ObjectUtil.isNull(maTechnician)) {
+            throw new ServiceException("商户不存在");
+        }
+
+        List<TAddress> merchantAddresslist = this.addressService.list(new LambdaQueryWrapper<TAddress>()
+                .eq(TAddress::getMerchantId, dto.getMerchantId())
+                .eq(TAddress::getUserType, 2)
+                .eq(TAddress::getIsDelete, 0));
+        if (CollUtil.isEmpty(merchantAddresslist)) {
+            throw new ServiceException("商户地址不存在");
+        }
+
+        order.setMerchantId(dto.getMerchantId());
+        order.setMerchantType(maTechnician.getTechType());
+        order.setMerchantNickName(maTechnician.getTeNickName());
+        order.setMerchantAvatar(maTechnician.getTeAvatar());
+
+        // 4. 获取联系人信息
+        TAddress address = this.addressService.getById(dto.getAddressId());
+        if (ObjectUtil.isNull(address)) {
+            throw new ServiceException("客户联系地址不存在");
+        }
+
+        order.setContactPersonName(address.getUserName());
+        order.setContactPhoneNumber(address.getPhone());
+        order.setContactAddressInfo(address.getDetailAddress());
+
+        // 5. 设置价格信息
+        LocalDateTime appointmentStartTime = dto.getAppointmentStartTime();
+
+        Integer paymentMethod = dto.getPaymentMethod();
+        // 优惠券优惠
+        BigDecimal couponDiscount = Optional.ofNullable(dto.getCouponDiscount()).orElse(BigDecimal.ZERO);
+        // 车费
+        BigDecimal trafficFee = Optional.ofNullable(dto.getTrafficFee()).orElse(BigDecimal.ZERO);
+        // 商品原价
+        BigDecimal price = Optional.ofNullable(project.getPrice()).orElse(BigDecimal.ZERO);
+
+        // 实付金额 = 商品原价 - 优惠券优惠 + 车费
+        BigDecimal finalAmount = price.subtract(couponDiscount).add(trafficFee);
+
+        order.setBasePrice(price);
+        order.setCouponDiscount(couponDiscount);
+        order.setTrafficFee(trafficFee);
+        order.setFinalAmount(finalAmount);
+        order.setPaymentMethod(paymentMethod);
+
+        order.setCreateTime(DateUtils.getNowDate());
+        order.setAppointmentStartTime(appointmentStartTime);
+        order.setStatus(0);
+        order.setExecStatus(0);
+        order.setDispatchedStatus(0);
+
+        // 6.经纬度信息
+        order.setUserLatitude(new BigDecimal(address.getLatitude()));
+        order.setUserLongitude(new BigDecimal(address.getLongitude()));
+        //取默认真实地址(type=1)
+        Optional<TAddress> realAddrOpt = merchantAddresslist.stream()
+                .filter(a -> a.getType() == 1)
+                .findFirst();
+        //取默认虚拟地址(type=2)
+        Optional<TAddress> virtualAddrOpt = merchantAddresslist.stream()
+                .filter(a -> a.getType() == 2)
+                .findFirst();
+
+        realAddrOpt.ifPresent(addr -> {
+            order.setMerchantLongitude(new BigDecimal(addr.getLongitude()));
+            order.setMerchantLatitude(new BigDecimal(addr.getLatitude()));
+        });
+        virtualAddrOpt.ifPresent(addr -> {
+            order.setVirtualLongitude(new BigDecimal(addr.getLongitude()));
+            order.setVirtualLatitude(new BigDecimal(addr.getLatitude()));
+        });
+
+        boolean saveResult = this.save(order);
+        if (!saveResult) {
+            throw new ServiceException("添加订单失败");
+        }
+    }
 }