2 Revize b0a395342f ... 319ccd1acc

Autor SHA1 Zpráva Datum
  jinshihui 319ccd1acc Merge remote-tracking branch 'origin/point_dev' into point_dev před 4 dny
  jinshihui d9bc89ab2e 添加了注释信息 před 4 dny

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

@@ -117,6 +117,11 @@ public class ProductOrderController extends BaseController {
         }
     }
 
+    /**
+     * 订单确认收货
+     * @param dto
+     * @return R
+     */
     @ApiOperation("订单确认收货接口")
     @PutMapping("/confirm/receipt")
     public R confirmReceipt(@Validated @RequestBody ProductOrderOperateDTO dto) {

+ 2 - 0
nightFragrance-common/src/main/java/com/ylx/common/utils/SecurityUtils.java

@@ -77,6 +77,8 @@ public class SecurityUtils {
 
     /**
      * 获取微信用户
+     *
+     * @return WxLoginUser
      **/
     public static WxLoginUser getWxLoginUser() {
         try {

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

@@ -557,6 +557,11 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         this.productOrderInfoMapper.updateById(productOrderInfo);
     }
 
+    /**
+     * 获取当前微信登录的用户信息
+     *
+     * @return WxLoginUser
+     */
     private WxLoginUser getCurrentWxLoginUser() {
         WxLoginUser loginUser = SecurityUtils.getWxLoginUser();
         if (ObjectUtil.isNull(loginUser)) {