jinshihui 12 часов назад
Родитель
Сommit
e521422272

+ 5 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/AfterSaleOrderController.java

@@ -103,6 +103,11 @@ public class AfterSaleOrderController {
         return R.ok();
         return R.ok();
     }
     }
 
 
+    /**
+     * 商家同意退款申请
+     * @param orderId
+     * @return R
+     */
     @ApiOperation("商家同意退款申请")
     @ApiOperation("商家同意退款申请")
     @Log(title = "同意退款", businessType = BusinessType.UPDATE)
     @Log(title = "同意退款", businessType = BusinessType.UPDATE)
     @PutMapping("/agree/refund/{orderId}")
     @PutMapping("/agree/refund/{orderId}")

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

@@ -411,7 +411,7 @@ public class PayController {
      * @param amount 退款金额
      * @param amount 退款金额
      * @param transactionId 微信支付订单号
      * @param transactionId 微信支付订单号
      * @param outTradeNo 商户订单号
      * @param outTradeNo 商户订单号
-     * @return String
+     * @return String 退款结果
      */
      */
     @RequestMapping("/refund")
     @RequestMapping("/refund")
     @ResponseBody
     @ResponseBody

+ 5 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/point/PointActivityController.java

@@ -124,6 +124,11 @@ public class PointActivityController extends BaseController {
         return R.ok(list);
         return R.ok(list);
     }
     }
 
 
+    /**
+     * 用户签到接口
+     * @param dto
+     * @return R
+     */
     @ApiOperation("用户签到接口")
     @ApiOperation("用户签到接口")
     @PostMapping(value = "/sign")
     @PostMapping(value = "/sign")
     public R sign(@Validated @RequestBody SignDTO dto) {
     public R sign(@Validated @RequestBody SignDTO dto) {

+ 1 - 1
nightFragrance-common/src/main/java/com/ylx/common/config/WxPayConfig.java

@@ -50,7 +50,7 @@ public class WxPayConfig {
     private String certPath;
     private String certPath;
 
 
     /**
     /**
-     * 证书钥地址
+     * 证书钥地址
      */
      */
     private String certKeyPath;
     private String certKeyPath;
 
 

+ 1 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/ProductOrderPayRequest.java

@@ -20,7 +20,7 @@ public class ProductOrderPayRequest implements Serializable {
     private String orderNo;
     private String orderNo;
 
 
     /**
     /**
-     * 支付方式:1微信支付 2:余额支付
+     * 支付方式:1微信支付 2:余额支付 3:积分支付
      */
      */
     private Integer payType;
     private Integer payType;
 
 

+ 6 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/service/IProductOrderInfoService.java

@@ -67,5 +67,11 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
 
 
     void editConsigneesInfo(ProductOrderOperateDTO dto);
     void editConsigneesInfo(ProductOrderOperateDTO dto);
 
 
+    /**
+     * 获取并检查订单是否存在
+     * @param orderId
+     * @param openId
+     * @return ProductOrderInfo 订单信息
+     */
     ProductOrderInfo getAndCheckOrder(Long orderId, String openId);
     ProductOrderInfo getAndCheckOrder(Long orderId, String openId);
 }
 }

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

@@ -73,7 +73,7 @@ public interface TRechargeService extends IService<TRecharge> {
      * @param transactionId 支付交易号,通过此交易号可以追溯交易支付时的信息
      * @param transactionId 支付交易号,通过此交易号可以追溯交易支付时的信息
      * @param outTradeNo 商户系统内部的订单号,与transactionId不能同时为空
      * @param outTradeNo 商户系统内部的订单号,与transactionId不能同时为空
      * @param amount 退款金额,单位为元
      * @param amount 退款金额,单位为元
-     * @return 如果退款成功,返回退款成功的标识字符串;如果失败,返回错误信息字符串
+     * @return String 如果退款成功,返回退款成功的标识字符串;如果失败,返回错误信息字符串
      */
      */
     String refund(String outRefundNo, String transactionId, String outTradeNo, BigDecimal amount);
     String refund(String outRefundNo, String transactionId, String outTradeNo, BigDecimal amount);
 
 

+ 4 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AfterSaleOrderServiceImpl.java

@@ -301,17 +301,20 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
         if (ObjectUtil.isNull(afterSaleOrder)) {
         if (ObjectUtil.isNull(afterSaleOrder)) {
             throw new ServiceException("未找到可审核的售后单");
             throw new ServiceException("未找到可审核的售后单");
         }
         }
-
+        // 售后类型
         AfterSaleTypeEnum typeEnum = AfterSaleTypeEnum.valueOf(afterSaleOrder.getAfterSaleType());
         AfterSaleTypeEnum typeEnum = AfterSaleTypeEnum.valueOf(afterSaleOrder.getAfterSaleType());
         AfterSaleStatusEnum statusEnum = AfterSaleStatusEnum.valueOf(afterSaleOrder.getAfterSaleStatus());
         AfterSaleStatusEnum statusEnum = AfterSaleStatusEnum.valueOf(afterSaleOrder.getAfterSaleStatus());
 
 
+        // 判断售后单的售后类型
         switch (typeEnum) {
         switch (typeEnum) {
+            // 未收到货
             case NOT_RECEIVED:
             case NOT_RECEIVED:
                 // ====================== 未收到货 → 仅退款 ======================
                 // ====================== 未收到货 → 仅退款 ======================
                 if (statusEnum != AfterSaleStatusEnum.WAIT_AUDIT) {
                 if (statusEnum != AfterSaleStatusEnum.WAIT_AUDIT) {
                     throw new ServiceException("仅退款单状态异常,无法审核");
                     throw new ServiceException("仅退款单状态异常,无法审核");
                 }
                 }
                 break;
                 break;
+            // 已收到货,退货
             case RETURN_GOODS:
             case RETURN_GOODS:
                 // ====================== 已收到货 → 退货退款 ======================
                 // ====================== 已收到货 → 退货退款 ======================
                 if (statusEnum != AfterSaleStatusEnum.WAITING_MERCHANT_RECEIVE) {
                 if (statusEnum != AfterSaleStatusEnum.WAITING_MERCHANT_RECEIVE) {

+ 9 - 0
nightFragrance-massage/src/main/java/com/ylx/point/domain/PointSignTask.java

@@ -48,12 +48,21 @@ public class PointSignTask extends BaseEntity {
     @Excel(name = "逻辑删除")
     @Excel(name = "逻辑删除")
     private Integer isDeleted;
     private Integer isDeleted;
 
 
+    /**
+     * 创建人
+     */
     @TableField(exist = false)
     @TableField(exist = false)
     private String createBy;
     private String createBy;
 
 
+    /**
+     * 更新人
+     */
     @TableField(exist = false)
     @TableField(exist = false)
     private String updateBy;
     private String updateBy;
 
 
+    /**
+     * 活动名称
+     */
     @TableField(exist = false)
     @TableField(exist = false)
     private String activityName;
     private String activityName;
 
 

+ 5 - 0
nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointActivityServiceImpl.java

@@ -1013,6 +1013,11 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
         }
     }
     }
 
 
+    /**
+     * 获取当前城市生效的签到任务
+     * @param cityCode
+     * @return PointSignTask 积分签到任务规则
+     */
     private PointSignTask getEnabledTask(String cityCode) {
     private PointSignTask getEnabledTask(String cityCode) {
         // 1. 根据城市查询当前生效的活动
         // 1. 根据城市查询当前生效的活动
         PointActivity activity = pointActivityMapper.selectOne(
         PointActivity activity = pointActivityMapper.selectOne(