Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java

@@ -402,6 +402,13 @@
                commoditySpecs.setUpdateAt(nowDate);
                commoditySpecsMapper.updateById(commoditySpecs);
            }
            if(commodityOrder.getActivityId() != null){
                ComBatteryCommodityActivity commodityActivity = commodityActivityMapper.selectById(commodityOrder.getActivityId());
                if(!commodityActivity.getType().equals(ComBatteryCommodityActivity.Type.PT)){
                    commodityActivity.setCommoditySaleNum(commodityActivity.getCommoditySaleNum() - commodityOrder.getCount());
                    commodityActivityMapper.updateById(commodityActivity);
                }
            }
        });
        return R.ok();
    }
@@ -501,6 +508,7 @@
                        //用户开团,创建团队信息
                        orderCollageTeam = getOrderCollageTeam(commodityOrder,nowDate);
                        orderCollageTeamMapper.insert(orderCollageTeam);
                        commodityOrder.setTeamId(orderCollageTeam.getId());
                    }else{
                        //用户参团,查询参加的团队信息
                        orderCollageTeam = orderCollageTeamMapper.selectById(commodityOrder.getTeamId());
@@ -510,11 +518,7 @@
                        ComBatteryCommodityOrderCollageTeamPeople orderCollageTeamPeople = getOrderCollageTeamPeople(commodityOrder.getUserId()
                                ,nowDate,orderCollageTeam,notifyOrderDTO.getAttach());
                        orderCollageTeamPeopleMapper.insert(orderCollageTeamPeople);
                        //判断当前拼团人员是否已足够成团
                        syncAssortedDoughStatus(orderCollageTeam.getId(),nowDate);
                    }
                    //判断当前拼团活动是否已完成
                    syncAssortedDoughActivityStatus(commodityOrder.getActivityId(),nowDate);
                    break;
                case ComBatteryCommodityOrder.ActivityType.KJ:
                    //砍价订单成功支付处理
@@ -540,6 +544,15 @@
        commodityOrder.setUpdateAt(nowDate);
        commodityOrder.setPayTime(payTime);
        this.baseMapper.updateById(commodityOrder);

        if(commodityOrder.getTeamId() != null){
            //判断当前拼团人员是否已足够成团
            syncAssortedDoughStatus(commodityOrder.getTeamId(),nowDate);
        }
        if(commodityOrder.getActivityId() != null && commodityOrder.getActivityType().equals(ComBatteryCommodityOrder.ActivityType.PT)){
            //判断当前拼团活动是否已完成
            syncAssortedDoughActivityStatus(commodityOrder.getActivityId(),nowDate);
        }
        return R.ok();
    }

@@ -613,7 +626,7 @@
            if(commodityActivity != null){
                Integer count = orderCollageTeamPeopleMapper.selectCount(new QueryWrapper<ComBatteryCommodityOrderCollageTeamPeople>()
                        .lambda().eq(ComBatteryCommodityOrderCollageTeamPeople::getTeamId,teamId));
                if(count >= commodityActivity.getCollageNum()){
                if(count >= commodityActivity.getCollagePeopleNum()){
                    //拼团条件满足，将所有已拼单的用户的订单更新为待发货状态
                    //更新拼团团队记录
                    orderCollageTeam.setStatus(ComBatteryCommodityOrderCollageTeam.Status.PTCG);
@@ -651,7 +664,7 @@
        //查询商品信息
        ComBatteryCommodity commodity = commodityMapper.selectById(commodityOrder.getCommodityId());
        if(commodity != null){
            orderBargain.setCurrentPrice(commodity.getPrice());
            orderBargain.setOriginalPrice(commodity.getPrice());
            orderBargain.setCurrentPrice(commodity.getPrice());
        }
        //查询活动信息