Merge branch 'dev/2024/0806/update-app-Y' of Harper/feifan-backend-zx-app into master

用户下单即算即得,直接获得可用积分而不是冻结积分

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofit/PtProfitMapper.java

@@ -30,7 +30,8 @@ public interface PtProfitMapper extends BaseMapperX<PtProfitDO> {
     }
 
     @Update("UPDATE distri_integral SET current_quota = current_quota + #{amount},freeze_quota = freeze_quota + #{freeze_mount} " +
-            "WHERE (current_quota + #{amount2})>=0 and user_id=#{userId} and (freeze_quota + #{freeze_mount2})>=0 ")
+            "WHERE user_id=#{userId}")
+//            "WHERE (current_quota + #{amount2})>=0 and user_id=#{userId} and (freeze_quota + #{freeze_mount2})>=0 ")
     int updateUserIntegral(@Param("amount") Long amount,
                            @Param("amount2") Long amount2,
                            @Param("freeze_mount") Long freezeAmount,

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.newfeifan.mall.framework.common.core.KeyValue;
 import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
+import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
 import cn.newfeifan.mall.framework.common.util.number.MoneyUtils;
 import cn.newfeifan.mall.module.distri.constant.DistriConstants;
@@ -96,7 +97,6 @@ import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -572,6 +572,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_CREATE)
     public TradeOrderDO createOrder(Long userId, AppTradeOrderCreateReqVO createReqVO) {
 
+        if(createReqVO.getPayIntegral() != null && createReqVO.getPayIntegral() < 0){
+            ErrorCode ERROR = new ErrorCode(1_011_000_013, "抵扣佣金不能小于0");
+            throw exception(ERROR);
+        }
+
         //校验最大值 start  add by Ben
         //查询订单提成比例
         QueryWrapper<OrderPercentageDO> queryWrapper = new QueryWrapper<>();
@@ -1268,9 +1273,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         rs.add(newSocialStatus);
 
         // 七天获得变为即算即得,后续如果恢复把这里注释即可,并打开平台定时任务得订单结算
-        CompletableFuture.runAsync(() -> {
+//        CompletableFuture.runAsync(() -> {
             calc(TradeOrderDOList, orderPercentageDO, JsonUtils.toJsonString(orderPercentageDO));
-        });
+//        });
 
         return rs;
     }