优化代码

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

@@ -220,6 +220,11 @@ public class PayController {
         return serialNo;
     }
 
+    /**
+     * 微信支付回调接口
+     * @param request
+     * @param response
+     */
     @RequestMapping(value = "/payNotify", method = {org.springframework.web.bind.annotation.RequestMethod.POST, org.springframework.web.bind.annotation.RequestMethod.GET})
     @ResponseBody
     @ApiOperation("微信支付回调接口")

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

@@ -149,6 +149,11 @@ public class WeChatController extends BaseController {
 
     }
 
+    /**
+     * 前端获取jssdk签名
+     * @param url
+     * @return Map<?,?>
+     */
     @GetMapping("/getSignature")
     @ApiOperation("前端获取jssdk签名")
     @Log(title = "前端获取jssdk签名", businessType = BusinessType.OTHER)

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

@@ -59,6 +59,10 @@ public interface TOrderService extends IService<TOrder> {
 
     void takingOrders(TOrder order);
 
+    /**
+     *
+     * @param outTradeNo
+     */
     void payNotifyOrder(String outTradeNo);
 
     Object updateAddressById(TOrder borrow);

nightFragrance-massage/src/main/java/com/ylx/massage/service/TRechargeService.java

@@ -57,7 +57,7 @@ public interface TRechargeService extends IService<TRecharge> {
      * @param openId 微信用户 OpenID，用于标识支付用户
      * @param description 商品描述，显示在支付详情页
      * @param attach 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
-     * @return 支付参数结果对象，包含小程序支付所需的参数
+     * @return R 支付参数结果对象，包含小程序支付所需的参数
      * @throws Exception 当微信支付接口调用失败时抛出异常
      */
     R getPay(String setOutTradeNo, BigDecimal amount, String openId, String description, String attach) throws Exception;

nightFragrance-massage/src/main/java/com/ylx/massage/service/TWxUserService.java

@@ -11,6 +11,11 @@ import com.ylx.massage.domain.vo.TWxUserVo;
  */
 public interface TWxUserService extends IService<TWxUser> {
 
+    /**
+     * 根据openId查询用户
+     * @param openId
+     * @return TWxUser
+     */
     public TWxUser getByOpenId(String openId);
 
     Page<TWxUserVo> getUserList(Page<TWxUserVo> page, TWxUserVo user);

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

@@ -691,6 +691,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         tConsumptionLog.setAmount(orderNew.getTotalPrice().negate());
         tConsumptionLog.setBillNo(orderNew.getOrderNo());
         tConsumptionLog.setOpenId(orderNew.getcOpenId());
+        // 余额支付
         if (orderNew.getPayType().equals(MassageConstants.INTEGER_TWO)) {
             tConsumptionLog.setBillType(BillTypeEnum.BALANCE_PAYMENT.getCode());
             tConsumptionLog.setNote("余额支付");
@@ -701,8 +702,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             tConsumptionLog.setBillType(BillTypeEnum.CASH_PAYMENT.getCode());
             tConsumptionLog.setNote("现金支付");
         }
-
         consumptionLogService.save(tConsumptionLog);
+
         // 更新项目数据
         JSONArray objects = orderNew.getcGoods();
         objects.forEach(item -> {
@@ -723,8 +724,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             orderParam.setnStatus(OrderStatusEnum.SERVICE.getCode());
         }
 //            orderParam.setnStatus(OrderStatusEnum.SERVICE.getCode());
-        //更新及技师状态
+        //更新技师状态
         updateJs(orderNew);
+        // 更新订单的信息
         updateById(orderParam);
         //
         //this.newOrderNotification(orderNew);
@@ -1297,7 +1299,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
 
         if (Objects.equals(js.getnStatus(), JsStatusEnum.JS_SERVICEABLE.getCode())) {
-            // 更新技师状态
+            // 更新技师状态 服务中
             js.setnStatus(JsStatusEnum.JS_SERVICE.getCode());
             // 确保js.getnNum()不为null，避免 NullPointerException
             int num = js.getnNum() == null ? 0 : js.getnNum();

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

@@ -144,7 +144,6 @@ public class TRechargeServiceImpl extends ServiceImpl<TRechargeMapper, TRecharge
     public R getPay(String setOutTradeNo, BigDecimal amount, String openId, String description, String attach) throws Exception {
         String timeExpire = DateTimeZoneUtil.dateToTimeZone(System.currentTimeMillis() + 1000 * 60 * 3);
         UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel()
-//                .setAppid(wxPayProperties.getAppId())
                 .setAppid(wechatAccountConfig.getMpAppId())
                 .setMchid(wxPayProperties.getMchId())
                 //商品描述