fix 签到积分;签到积分配置

netflix-service/src/main/java/com/cyksj/service/market/impl/MarketFrontServiceImpl.java

@@ -326,7 +326,12 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 				//发放积分
 				SignConfig signConfig = signConfigMapper.selectOne(Wrappers.lambdaQuery(SignConfig.class)
 						.like(SignConfig::getType, signUser.getDayPeriod()).last("limit 1"));
-				points = ThreadLocalRandom.current().nextInt(signConfig.getMinPoints(), signConfig.getMaxPoints() + 1);
+				if (signConfig != null) {
+					points = ThreadLocalRandom.current().nextInt(signConfig.getMinPoints(), signConfig.getMaxPoints() + 1);
+				} else {
+					points = signConfigMapper.selectOne(Wrappers.lambdaQuery(SignConfig.class)
+							.orderByAsc(SignConfig::getId).last("limit 1")).getMaxPoints();
+				}
 			} else {
 				points = signConfigMapper.selectOne(Wrappers.lambdaQuery(SignConfig.class)
 						.orderByAsc(SignConfig::getId).last("limit 1")).getMaxPoints();

netflix-web/src/main/java/com/cyksj/web/controller/market/SignFrontController.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.market.sign.SignConfigMapper;
 import com.cyksj.mapper.market.sign.UserPointsRecordMapper;
+import com.cyksj.model.entity.SignConfig;
 import com.cyksj.model.entity.SignUser;
 import com.cyksj.model.entity.UserPointsRecord;
 import com.cyksj.model.views.SignUserView;
@@ -14,6 +16,8 @@ import com.cyksj.web.util.StpUserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/applets/market/sign")
 @RequiredArgsConstructor
@@ -22,6 +26,8 @@ public class SignFrontController {
 
     private final UserPointsRecordMapper userPointsRecordMapper;
 
+    private final SignConfigMapper signConfigMapper;
+
     /**
      * 用户积分详情
      */
@@ -52,4 +58,13 @@ public class SignFrontController {
         SignUser signUser = marketFrontService.signByUserId(userId);
         return GatewayResponse.SUCCESS.newBuilder().setMsg("签到成功").toResult(signUser.getDayPeriod());
     }
+
+    /**
+     * 积分配置
+     */
+    @GetMapping("/get/points/config")
+    public Result<List<SignConfig>> getSign() {
+        return GatewayResponse.SUCCESS.newBuilder().toResult(signConfigMapper.selectList(Wrappers.lambdaQuery(SignConfig.class).orderByAsc(SignConfig::getId)));
+    }
+
 }