fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -52,7 +52,9 @@ import com.zhongzheng.modules.top.financial.vo.TopOrderRevocationVo;
 import com.zhongzheng.modules.top.financial.vo.TopSellerDiscountVo;
 import com.zhongzheng.modules.top.goods.bo.*;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
+import com.zhongzheng.modules.top.mall.service.ITopStoreService;
 import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
+import com.zhongzheng.modules.top.user.vo.TopSysPointsRuleVo;
 import com.zhongzheng.modules.wx.bo.WxInfoBo;
 import com.zhongzheng.modules.wx.bo.WxInfoQuery;
 import com.zhongzheng.modules.wx.bo.WxServerBody;
@@ -92,6 +94,7 @@ public class CommonController extends BaseController {
 
     private final ITopOldOrderService iTopOldOrderService;
 
+    private final ITopStoreService iTopStoreService;
     /**
      * 通用下载请求
      *
@@ -314,4 +317,14 @@ public class CommonController extends BaseController {
         List<TopOrderLogVo> list = iTopOldOrderService.logList(bo);
         return getDataTable(list);
     }
+
+    @ApiOperation("旧系统获取积分规则配置详情")
+    @GetMapping(value = "/configKey/pointsRule")
+    public AjaxResult getPointsRule(TopSellerDiscountBo bo)
+    {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return AjaxResult.success("配置内容",iTopStoreService.getPointsRuleConfig());
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -37,7 +37,9 @@ import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
+import com.zhongzheng.modules.top.mall.service.ITopStoreService;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
+import com.zhongzheng.modules.top.user.vo.TopSysPointsRuleVo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.*;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -116,7 +118,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     private IUserLoginErrorService iUserLoginErrorService;
     @Autowired
     private  ISysConfigService configService;
-
+    @Autowired
+    private  ITopStoreService iTopStoreService;
 
     @Override
     public UserVo queryById(Long userId) {
@@ -1141,6 +1144,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Boolean rechargeBatchVip(UserEditBo bo) {
+        TopSysPointsRuleVo ruleVo = iTopStoreService.getPointsRuleConfig();
         for(Long userId : bo.getUserIdList()){
             User user = getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, userId));
             if(Validator.isNotEmpty(user)&&(user.getVipTag()!=1&&user.getVipTag()!=3)){
@@ -1149,6 +1153,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             LambdaUpdateWrapper<User> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
             objectLambdaUpdateWrapper.eq(User::getUserId, userId);
             objectLambdaUpdateWrapper.set(User::getRechargeMoney, user.getRechargeMoney().add(bo.getRechargeCardMoney()));
+            if(ruleVo.getOneExchangeEnable()){
+                BigDecimal pointsValue = bo.getRechargeCardMoney().multiply(ruleVo.getOneExchangeValue());
+                objectLambdaUpdateWrapper.set(User::getPointsValue, user.getPointsValue().add(pointsValue));
+            }
             objectLambdaUpdateWrapper.set(User::getUpdateTime, DateUtils.getNowTime());
             this.update(null, objectLambdaUpdateWrapper);
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/vo/TopSysPointsRuleVo.java

@@ -23,7 +23,7 @@ private static final long serialVersionUID=1L;
     /** 角色ID */
 
     @ApiModelProperty("一元兑换多少积分")
-    private Integer oneExchangeValue;
+    private BigDecimal oneExchangeValue;
 
     @ApiModelProperty("一元兑换多少积分开启状态")
     private Boolean oneExchangeEnable;