优化代码

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

@@ -30,13 +30,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-
-
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 技师Controller

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

@@ -82,7 +82,7 @@ public class TOrderController extends BaseController {
      * 优惠卷核销
      *
      * @param order
-     * @return
+     * @return R<OrderVerificationVo>
      */
     @Log(title = "优惠卷核销", businessType = BusinessType.UPDATE)
     @ApiOperation("优惠卷核销")

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

@@ -42,15 +42,21 @@ public class Coupon extends Model<Coupon> {
     @ApiModelProperty("优惠类型， 2:折扣, 3:满减")
     private Integer discountType;
 
-    //优惠值
+    /**
+     * 优惠值
+     */
     @ApiModelProperty("优惠值")
     private BigDecimal discountValue;
 
-    //折扣值
+    /**
+     * 折扣值
+     */
     @ApiModelProperty("折扣值")
     private BigDecimal rebValue;
 
-    //门槛金额
+    /**
+     * 门槛金额
+     */
     @ApiModelProperty("门槛金额")
     private BigDecimal thresholdAmount;
 

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

@@ -7,20 +7,29 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
+ * 订单核销
+ *
  * @author jianlong
  * @date 2024-09-12 16:37
  */
 @Data
 @ApiModel("订单核销")
 public class OrderVerificationVo {
-
+    /**
+     * 优惠金额
+     */
     @ApiModelProperty("优惠金额")
     private BigDecimal preferential;
 
-
+    /**
+     * 优惠后金额
+     */
     @ApiModelProperty("优惠后金额")
     private BigDecimal totalPrice;
 
+    /**
+     * 领取优惠卷id
+     */
     @ApiModelProperty("领取优惠卷id")
     private String couponReceiveId;
 

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

@@ -538,20 +538,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     @Override
     public OrderVerificationVo verification(TOrder order) {
         if (StringUtils.isBlank(order.getCouponReceiveId())) {
-            throw new ServiceException("认领优惠券id为空");
+            throw new ServiceException("领取优惠卷id为空");
         }
         if (StringUtils.isBlank(order.getcId())) {
             throw new ServiceException("订单id为空");
         }
         OrderVerificationVo orderVerificationVo = new OrderVerificationVo();
         TOrder tOrder = this.getById(order.getcId());
+        log.info("订单信息,{}", tOrder);
+
         orderVerificationVo.setCouponReceiveId(order.getCouponReceiveId());
         CouponReceive couponReceive = couponReceiveService.getById(order.getCouponReceiveId());
         Coupon coupon = couponService.getById(couponReceive.getCouponId());
-        log.info("订单信息,{}", tOrder);
         log.info("优惠卷信息,{}", coupon);
 
-
         //折扣券
         if (coupon.getDiscountType() == 2) {
             //判断门槛金额