Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java

@@ -1,10 +1,14 @@
 package com.czg.controller.user;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.czg.account.dto.points.OrderDeductionPointsDTO;
+import com.czg.account.dto.points.PointsBasicSettingDTO;
 import com.czg.account.entity.MemberPoints;
+import com.czg.account.entity.PointsBasicSetting;
 import com.czg.account.param.ConsumeAwardPointsParam;
 import com.czg.account.param.PayedDeductPointsParam;
 import com.czg.account.service.MemberPointsService;
+import com.czg.account.service.PointsBasicSettingService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import lombok.AllArgsConstructor;
@@ -25,6 +29,19 @@ public class UMemberPointsController {
 
     private final MemberPointsService memberPointsService;
 
+    private final PointsBasicSettingService pointsBasicSettingService;
+
+    /**
+     * 000-积分基本设置详情
+     */
+    @GetMapping("pointsBasicSetting")
+    public CzgResult<PointsBasicSettingDTO> getPointsBasicSetting() {
+        Long shopId = StpKit.USER.getShopId(0L);
+        PointsBasicSetting entity = pointsBasicSettingService.getById(shopId);
+        PointsBasicSettingDTO data = BeanUtil.copyProperties(entity, PointsBasicSettingDTO.class);
+        return CzgResult.success(data);
+    }
+
     /**
      * 001-会员积分账户信息
      */