Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/app/appOrder/controller/AppOrderController.java

@@ -57,7 +57,7 @@ public class AppOrderController extends CyPaginationController<CmsOrder> {
     @CyOpeLogAnno(title = "system-订单信息表管理-活动下单", businessType = CyLogTypeEnum.INSERT)
     @Operation(summary="活动下单", description="活动下单")
     @PostMapping(value = "/order/add")
-    public CyResult add(@Valid CmsOrder cmsOrder, BindingResult bindingResult) {
+    public CyResult add(@Valid @RequestBody CmsOrder cmsOrder, BindingResult bindingResult) {
         CyPersistModel data = cmsOrderServiceImpl.persist(cmsOrder);
         return CyResultGenUtil.builder(data,
                 CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/business/cmsActivity/service/impl/CmsActivityServiceImpl.java

@@ -19,11 +19,13 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -44,7 +46,7 @@ public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, C
     @Autowired
     private RedissonClient redissonClient;
     @Autowired
-    private RedisTemplate redisTemplate;
+    private StringRedisTemplate redisTemplate;
     /**
      * 保存 活动
      *

src/main/java/org/rcisoft/business/cmsActivity/service/impl/StockService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +38,7 @@ public class StockService {
      * Redis 客户端
      */
     @Autowired
-    private RedisTemplate redisTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
 
     /**
      * 执行扣库存的脚本

src/main/java/org/rcisoft/business/cmsOrder/service/impl/CmsOrderServiceImpl.java

@@ -28,6 +28,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -42,6 +43,8 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Resource;
+
 /**
  * Created by cy on 2025年1月6日 下午1:44:44.
  */
@@ -71,7 +74,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
     private CmsActivityRepository activityRepository;
 
     @Autowired
-    private RedisTemplate redisTemplate;
+    private StringRedisTemplate redisTemplate;
 
     @Autowired
     CyIdGenUtil cyIdGenUtil;
@@ -154,7 +157,8 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
             orderInfo.setBusinessId(orderId);
             orderInfo.setName(info.getTitle());
 //            orderInfo.setGoodsId(orderGoodsDto.getGoodsId());
-            orderInfo.setUserId(Integer.valueOf(CyUserUtil.getAuthenBusinessId()));
+            String userId = CyUserUtil.getAuthenBusinessId();
+            orderInfo.setUserId(Integer.valueOf(userId));
             orderInfo.setAccount(CyUserUtil.getAuthenUsername());
 //            orderInfo.setNum(orderInfo.getNum());
             //计算价格 -开始
@@ -182,7 +186,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
     }
 
     //初始化redis  活动数
-    private int initStock(long goodsId) {
+    private int initStock(Integer goodsId) {
         CmsActivity info = activityRepository.selectById(goodsId);
         //redis ttl 活动结束时间+1天
         Date endTime = TimeUtil.getTime(info.getEndTime(), Calendar.DATE, 1);

src/main/java/org/rcisoft/core/async/AsyncFactory.java

@@ -21,6 +21,7 @@ import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -67,7 +68,7 @@ public class AsyncFactory
                     AtomicReference<Integer> num = new AtomicReference<>(info.getMaxApplicationCount());
                     //已报名人数计算： 数据库+ redis【order:activity:${所有}】 value 【hash】未取消 的并集
                     QueryWrapper<CmsOrder> wrapper = new QueryWrapper<>();
-                    wrapper.eq("activity_id", id);
+                    wrapper.eq("goods_id", id);
                     wrapper.notIn("status", 1, 2, 3, 4, 5, 6, 7, 10);
                     wrapper.eq("del_flag", 0);
                     List<CmsOrder> orderList = CySpringBeanComp.getBean(CmsOrderRepository.class).selectList(wrapper);
@@ -75,7 +76,7 @@ public class AsyncFactory
                         num.set(num.get() - orderInfo.getNum());
                     }
                     List<Long> orderIds = orderList.stream().map(CmsOrder::getBusinessId).toList();
-                    Set<String> map = CySpringBeanComp.getBean(RedisTemplate.class).keys(RedisCons.ORDER_ACTIVITY + ":" + id + "*");
+                    Set<String> map = CySpringBeanComp.getBean(StringRedisTemplate.class).keys(RedisCons.ORDER_ACTIVITY + ":" + id + "*");
                     if (CollectionUtils.isNotEmpty(map)) {
                         //遍历获取对应报名量
                         map.forEach(m -> {

src/main/java/org/rcisoft/core/schedule/OrderSyncSchedule.java

@@ -25,12 +25,14 @@ import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.security.NoSuchAlgorithmException;
@@ -49,7 +51,7 @@ public class OrderSyncSchedule {
     private CyRedisService cyRedisServiceImpl;
 
     @Autowired
-    private RedisTemplate redisTemplate;
+    private StringRedisTemplate redisTemplate;
 
 //    @Autowired
 //    private CouponInfoRepository couponInfoRepository;