调整了购物金接口的代码位置

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

@@ -96,8 +96,7 @@ public class WxController extends BaseController {
     @Resource
     private IPointUserLogService pointUserLogService;
 
-    @Resource
-    private IGiftCardOrderService giftCardOrderService;
+
 
     @Resource(name = "commonAsyncExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@@ -400,27 +399,6 @@ public class WxController extends BaseController {
         }
     }
 
-    /**
-     * PC端根据用户ID查询用户购物金明细
-     *
-     * @param page 分页参数
-     * @param queryDTO 查询条件，包含用户ID、明细类型、开始时间、结束时间
-     * @return R<UserShoppingFundsDetailVO> 用户购物金明细
-     */
-    @GetMapping("pc/getUserShoppingFundsDetail")
-    @ApiOperation("PC端根据用户ID查询用户购物金明细")
-    public R<UserShoppingFundsDetailVO> getUserShoppingFundsDetail(Page<UserShoppingFundsDetailItemVO> page, UserShoppingFundsDetailQueryDTO queryDTO) {
-        try {
-            if (queryDTO == null || StringUtils.isBlank(queryDTO.getUserId())) {
-                return R.fail("userId不能为空");
-            }
-            return R.ok(giftCardOrderService.getPcUserShoppingFundsDetail(page, queryDTO));
-        } catch (IllegalArgumentException e) {
-            return R.fail(e.getMessage());
-        } catch (Exception e) {
-            log.error("查询用户购物金明细失败", e);
-            return R.fail("查询用户购物金明细失败");
-        }
-    }
+
 
 }

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

@@ -10,7 +10,13 @@ import java.math.BigDecimal;
 @Data
 public class UserShoppingFundsSummaryVO {
 
+    /**
+     * 合计金额
+     */
     private BigDecimal totalAmount;
 
+    /**
+     * 合计笔数
+     */
     private Long totalCount;
 }

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

@@ -181,10 +181,11 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
         return vo;
     }
 
+    /**
+     * 校验购物金明细查询参数
+     * @param dto
+     */
     private void validateShoppingFundsDetailQuery(UserShoppingFundsDetailQueryDTO dto) {
-        if (dto == null || StringUtils.isBlank(dto.getUserId())) {
-            throw new IllegalArgumentException("userId不能为空");
-        }
         if (dto.getDetailType() == null) {
             dto.setDetailType(DETAIL_TYPE_PURCHASE);
         }
@@ -193,6 +194,10 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
         }
     }
 
+    /**
+     * 格式化时间范围
+     * @param dto
+     */
     private void normalizeTimeRange(UserShoppingFundsDetailQueryDTO dto) {
         if (StringUtils.isNotBlank(dto.getStartTime()) && dto.getStartTime().trim().length() == 10) {
             dto.setStartTime(dto.getStartTime().trim() + " 00:00:00");

nightFragrance-massage/src/main/java/com/ylx/shopingfundsdetail/mapper/ShoppingFundsDetailMapper.java

@@ -35,7 +35,7 @@ public interface ShoppingFundsDetailMapper extends BaseMapper<ShoppingFundsDetai
      * 查询PC端用户购物金支出汇总
      *
      * @param dto 查询条件
-     * @return 购物金支出汇总
+     * @return UserShoppingFundsSummaryVO 购物金支出汇总
      */
     UserShoppingFundsSummaryVO selectPcExpenseShoppingFundsSummary(@Param("dto") UserShoppingFundsDetailQueryDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/shoppingfunds/controller/AdminShoppingFundsController.java

@@ -0,0 +1,49 @@
+package com.ylx.shoppingfunds.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.core.domain.R;
+import com.ylx.giftCard.domain.dto.UserShoppingFundsDetailQueryDTO;
+import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailItemVO;
+import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailVO;
+import com.ylx.giftCard.service.IGiftCardOrderService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
+/**
+ * PC后台购物金Controller
+ */
+@Slf4j
+@RestController
+@RequestMapping("/admin/shoppingFunds")
+public class AdminShoppingFundsController {
+
+    @Resource
+    private IGiftCardOrderService giftCardOrderService;
+
+    /**
+     * 根据用户ID查询用户购物金明细
+     *
+     * @param page 分页参数
+     * @param queryDTO 查询条件，包含用户ID、明细类型、开始时间、结束时间
+     * @return R<UserShoppingFundsDetailVO> 用户购物金明细
+     */
+    @GetMapping("/getUserShoppingFundsDetail")
+    @ApiOperation("根据用户ID查询用户购物金明细")
+    public R<UserShoppingFundsDetailVO> getUserShoppingFundsDetail(Page<UserShoppingFundsDetailItemVO> page, UserShoppingFundsDetailQueryDTO queryDTO) {
+        try {
+            if (StringUtils.isBlank(queryDTO.getUserId())) {
+                return R.fail("userId不能为空");
+            }
+            return R.ok(giftCardOrderService.getPcUserShoppingFundsDetail(page, queryDTO));
+        } catch (IllegalArgumentException e) {
+            return R.fail(e.getMessage());
+        } catch (Exception e) {
+            log.error("查询用户购物金明细失败", e);
+            return R.fail("查询用户购物金明细失败");
+        }
+    }
+}

nightFragrance-massage/src/main/resources/mapper/giftCard/ShoppingFundsDetailMapper.xml

@@ -28,6 +28,7 @@
         </if>
     </select>
 
+    <!--查询支出的购物金明细-->
     <select id="selectPcExpenseShoppingFundsDetail" resultType="com.ylx.giftCard.domain.vo.UserShoppingFundsDetailItemVO">
         SELECT
             d.order_no AS orderNo,
@@ -49,6 +50,7 @@
             d.create_time DESC
     </select>
 
+    <!--查询支出的购物金明细摘要-->
     <select id="selectPcExpenseShoppingFundsSummary" resultType="com.ylx.giftCard.domain.vo.UserShoppingFundsSummaryVO">
         SELECT
             COALESCE(SUM(d.amount), 0) AS totalAmount,