seata 同步 支付调整

jiangqs

2023-09-04 c97706c3cc213b7db3d381e8a0435ff0ef9a04d6

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

@@ -138,12 +138,12 @@
        Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
        Date activityEndTime = mgtActivityEditDto.getActivityEndTime();
        // 根据当前时间和活动时间判断活动状态
        if (nowTime.compareTo(activityStartTime) < 0) {
        /*if (nowTime.compareTo(activityStartTime) < 0) {
            activity.setActivityStatus(0);
        } else {
            activity.setActivityStatus(1);

        }
        }*/
        // 设置活动信息
        activity.setActivityName(mgtActivityEditDto.getActivityName());
        activity.setActivityIntroduce(mgtActivityEditDto.getActivityIntroduce());
@@ -172,6 +172,7 @@
                activity.setApplicableShop(result);
            }
        }
        activity.setActivityStatus(0);
        this.saveOrUpdate(activity);
        // 获取活动商品信息
        List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
@@ -186,6 +187,7 @@
                        activityGoods.setActivityPrice(dto.getActivityPrice());
                        activityGoods.setActivitySubscription(dto.getActivitySubscription());
                        activityGoods.setActivityNumber(dto.getActivityNumber());
                        activityGoods.setActivityStock(dto.getActivityNumber());
                        activityGoods.setSalesNumber(0);
                        activityGoods.setActivityDeadline(activity.getActivityEndTime());
                        activityGoods.setSellOutFlag(0);
@@ -459,12 +461,14 @@
        String activityId = activityGoodsGetDto.getActivityId();
        String goodsId = activityGoodsGetDto.getGoodsId();
        Activity activity = this.getById(activityId);
        //获取活动商品
        ActivityGoods activityGoods = activityGoodsService.getByGoodsId(activityId,goodsId);
        activityGoodsGetVo.setActivityName(activity.getActivityName());
        activityGoodsGetVo.setActivityPrice(activityGoods.getActivityPrice());
        activityGoodsGetVo.setActivitySubscription(activityGoods.getActivitySubscription());
        activityGoodsGetVo.setActivityStatus(activity.getActivityStatus());
        Integer availableBuyNum = activityGoods.getActivityNumber() - activityGoods.getSalesNumber();
        //剩余库存
        Integer availableBuyNum = activityGoods.getActivityStock();
        //限购判断
        if(activityGoods.getPurchaseLimitationFlag()==1){
            Integer buyNum = activityRecordService.getUserActivityGoodsNum(goodsId,activityId,activityGoodsGetDto.getUserId());
@@ -550,7 +554,7 @@
            List<ActivityGoods> activityGoodsList = activityGoodsService.listByActivityId(activityId);
            if(activityGoodsList!=null&&!activityGoodsList.isEmpty()){
                for(ActivityGoods activityGoods : activityGoodsList){
                    redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityNumber());
                    redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityStock());
                }
            }
            this.saveOrUpdate(activity);