优化代码

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

@@ -28,6 +28,7 @@ import com.ylx.common.config.WxPayConfig;
 import com.ylx.common.core.domain.R;
 import com.ylx.massage.domain.TRecharge;
 import com.ylx.massage.enums.BillTypeEnum;
+import com.ylx.massage.enums.PayTypeEnum;
 import com.ylx.massage.service.RefundVoucherService;
 import com.ylx.massage.service.TOrderService;
 import com.ylx.massage.service.TRechargeService;
@@ -72,10 +73,11 @@ public class PayController {
     @Resource
     private RefundVoucherService refundVoucherService;
 
-//    @Resource
+    //    @Resource
 //    private JsapiServiceExtension service;
     String serialNo;
     String platSerialNo;
+
     /**
      * 小程序微信支付的第一步,统一下单
      */
@@ -88,6 +90,7 @@ public class PayController {
 
     /**
      * 支付
+     *
      * @param setOutTradeNo
      * @param amount
      * @param openId
@@ -222,6 +225,7 @@ public class PayController {
 
     /**
      * 微信支付回调接口
+     *
      * @param request
      * @param response
      */
@@ -254,8 +258,11 @@ public class PayController {
                 // 处理业务逻辑
                 JSONObject jsonObject = new JSONObject(plainText);
                 if (jsonObject.get("attach").equals(BillTypeEnum.WX_PAY.getCode().toString())) {
-                    // 订单支付成功
+                    // 服务订单支付成功
                     orderService.payNotifyOrder(jsonObject.get("out_trade_no").toString());
+                } else if (jsonObject.get("attach").equals(PayTypeEnum.WX_PAY.getCode().toString())) {
+                    //商品订单支付成功
+
                 } else {
                     TRecharge outTradeNo = rechargeService.increaseAmount(jsonObject.get("out_trade_no").toString());
                 }
@@ -273,7 +280,6 @@ public class PayController {
     }
 
 
-
     @RequestMapping(value = "/test", method = {org.springframework.web.bind.annotation.RequestMethod.POST, org.springframework.web.bind.annotation.RequestMethod.GET})
     @ResponseBody
     @ApiOperation("测试")
@@ -412,19 +418,20 @@ public class PayController {
 
     /**
      * 退款
-     * @param outRefundNo 退款订单号
-     * @param amount 退款金额
+     *
+     * @param outRefundNo   退款订单号
+     * @param amount        退款金额
      * @param transactionId 微信支付订单号
-     * @param outTradeNo 商户订单号
+     * @param outTradeNo    商户订单号
      * @return String 退款结果
      */
     @RequestMapping("/refund")
     @ResponseBody
-    public String refund(@RequestParam(required = false) String outRefundNo, @RequestParam(required = false) BigDecimal amount,@RequestParam(required = false) String transactionId, @RequestParam(required = false) String outTradeNo) {
-        return rechargeService.refund(outRefundNo,transactionId,outTradeNo,amount);
+    public String refund(@RequestParam(required = false) String outRefundNo, @RequestParam(required = false) BigDecimal amount, @RequestParam(required = false) String transactionId, @RequestParam(required = false) String outTradeNo) {
+        return rechargeService.refund(outRefundNo, transactionId, outTradeNo, amount);
     }
 
-//    /**
+    //    /**
 //     * 退款通知
 //     */
 //    @RequestMapping(value = "/refundNotify", method = {RequestMethod.POST, RequestMethod.GET})
@@ -495,5 +502,4 @@ public class PayController {
     }
 
 
-
 }

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

@@ -78,7 +78,7 @@ public class ProductCreateDTO {
     private List<ProductSpecDTO> specList;
 
     /**
-     * 付款类型（1：积分 2：金额 3：积分+金额）
+     * 商品的付款类型（1：积分 2：金额 3：积分+金额）
      */
     @ApiModelProperty(value = "付款类型", required = true)
     private Integer paymentType;

nightFragrance-massage/src/main/java/com/ylx/massage/enums/PayTypeEnum.java

@@ -3,12 +3,24 @@ package com.ylx.massage.enums;
 /**
  * @author jianlong
  * @date 2024-03-27 15:31
- * 提现申请枚举
+ * 支付类型枚举
  */
 public enum PayTypeEnum {
 
-    WEI_PAY(1, "微信支付"),
-    BALANCE_PAY(2, "余额支付");
+    /**
+     * 微信支付
+     */
+    WX_PAY(1, "微信支付"),
+
+    /**
+     * 余额支付
+     */
+    BALANCE_PAY(2, "余额支付"),
+
+    /**
+     * 积分支付
+     */
+    POINT_PAY(3, "积分支付");
 
 
     private final Integer code;

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

@@ -18,10 +18,7 @@ import com.ylx.common.utils.SecurityUtils;
 import com.ylx.massage.domain.*;
 import com.ylx.massage.domain.dto.*;
 import com.ylx.massage.domain.vo.*;
-import com.ylx.massage.enums.AfterSaleStatusEnum;
-import com.ylx.massage.enums.BillTypeEnum;
-import com.ylx.massage.enums.PaymentStatusEnum;
-import com.ylx.massage.enums.ProductOrderStatusEnum;
+import com.ylx.massage.enums.*;
 import com.ylx.massage.mapper.AfterSaleOrderMapper;
 import com.ylx.massage.mapper.ProductMapper;
 import com.ylx.massage.mapper.ProductOrderInfoMapper;
@@ -282,7 +279,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         //6、判断支付方式
         if (productOrderPayRequest.getPayType().equals(MassageConstants.INTEGER_ONE)) {
             //微信支付
-            R resp = rechargeService.getPay(orderInfo.getOrderNo(), orderInfo.getTotalAmount(), orderInfo.getOpenId(), BillTypeEnum.WX_PAY.getInfo(), BillTypeEnum.WX_PAY.getCode().toString());
+            R resp = rechargeService.getPay(orderInfo.getOrderNo(), orderInfo.getTotalAmount(), orderInfo.getOpenId(), BillTypeEnum.WX_PAY.getInfo(), PayTypeEnum.WX_PAY.getCode().toString());
             return resp;
         } else if (productOrderPayRequest.getPayType().equals(MassageConstants.INTEGER_TWO)) {
             //余额支付

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

@@ -1305,7 +1305,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             int num = js.getnNum() == null ? 0 : js.getnNum();
             js.setnNum(num + MassageConstants.INTEGER_ONE);
         } else {
-            // 更新技师状态
+            // 更新技师状态 可服务
             js.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
             // 确保js.getnNum()不为null，避免 NullPointerException
             int num = js.getnNum() == null ? 0 : js.getnNum();