|
@@ -7,6 +7,8 @@ import cn.hutool.core.date.LocalDateTimeUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -19,6 +21,7 @@ import com.kxs.common.core.util.RetOps;
|
|
|
import com.kxs.common.core.util.SysUtils;
|
|
import com.kxs.common.core.util.SysUtils;
|
|
|
import com.kxs.common.security.util.SecurityUtils;
|
|
import com.kxs.common.security.util.SecurityUtils;
|
|
|
import com.kxs.product.api.feign.RemoteKxsProductService;
|
|
import com.kxs.product.api.feign.RemoteKxsProductService;
|
|
|
|
|
+import com.kxs.product.api.model.KxsMachine;
|
|
|
import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
|
|
import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
|
|
|
import com.kxs.system.api.feign.RemoteOldService;
|
|
import com.kxs.system.api.feign.RemoteOldService;
|
|
|
import com.kxs.system.api.model.KxsCampUser;
|
|
import com.kxs.system.api.model.KxsCampUser;
|
|
@@ -157,6 +160,12 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
|
|
|
if (CollUtil.isNotEmpty(errorMessageList)) {
|
|
if (CollUtil.isNotEmpty(errorMessageList)) {
|
|
|
return R.failed(JSON.toJSONString(errorMessageList));
|
|
return R.failed(JSON.toJSONString(errorMessageList));
|
|
|
}
|
|
}
|
|
|
|
|
+ //刷新参与人数
|
|
|
|
|
+ List<KxsCamp> kxsCamps = baseMapper.selectList(Wrappers.<KxsCamp>lambdaQuery().eq(KxsCamp::getStatus, CampStatusEnum.STATUS_NORMAL.getType()));
|
|
|
|
|
+ for (KxsCamp kxsCamp : kxsCamps) {
|
|
|
|
|
+ long count = kxsCampUserService.count(Wrappers.<KxsCampUser>lambdaQuery().eq(KxsCampUser::getCampId, kxsCamp.getId()));
|
|
|
|
|
+ baseMapper.update(null, Wrappers.<KxsCamp>lambdaUpdate().set(KxsCamp::getUserNum, count).eq(KxsCamp::getId, kxsCamp.getId()));
|
|
|
|
|
+ }
|
|
|
return R.ok();
|
|
return R.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -302,7 +311,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
|
|
|
R resR = remoteOldService.teamOpenTotalData(JSON.toJSONString(data));
|
|
R resR = remoteOldService.teamOpenTotalData(JSON.toJSONString(data));
|
|
|
if(resR.getStatus() == 1){
|
|
if(resR.getStatus() == 1){
|
|
|
if(resR.getData() != null){
|
|
if(resR.getData() != null){
|
|
|
- JSONObject jsonObject = JSON.parseObject(resR.getData().toString());
|
|
|
|
|
|
|
+ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(resR.getData()));
|
|
|
int total = jsonObject.getInteger("SelfPosMerchantCount")
|
|
int total = jsonObject.getInteger("SelfPosMerchantCount")
|
|
|
+ jsonObject.getInteger("TeamPosMerchantCount")
|
|
+ jsonObject.getInteger("TeamPosMerchantCount")
|
|
|
+ jsonObject.getInteger("SelfSimMerchantCount")
|
|
+ jsonObject.getInteger("SelfSimMerchantCount")
|