From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 04 九月 2023 13:59:52 +0800 Subject: [PATCH] 修改后台社区动态加载不出来 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java | 155 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 118 insertions(+), 37 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java index 1348577..bb375fe 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java @@ -6,14 +6,19 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO; import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO; +import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO; +import com.panzhihua.common.model.vos.community.VolunteerMerchantVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.VolunteerCreditsExchangeDao; import com.panzhihua.service_community.entity.VolunteerCreditsExchange; import com.panzhihua.service_community.entity.VolunteerIntegralMerchant; +import com.panzhihua.service_community.entity.VolunteerMerchant; import com.panzhihua.service_community.service.VolunteerCreditsExchangeService; import com.panzhihua.service_community.service.VolunteerIntegralMerchantService; +import com.panzhihua.service_community.service.VolunteerIntegralRecordService; +import com.panzhihua.service_community.service.VolunteerMerchantService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -30,6 +35,13 @@ @Resource private UserService userService; + + @Resource + private VolunteerIntegralRecordService virService; + + @Resource + private VolunteerMerchantService vmService; + @Override public R getList(int pageNum, int pageSize, String goodsId, String orderNumber, @@ -86,25 +98,34 @@ return R.fail("兑换用户id不能为空"); } - if(StringUtils.isEmpty(goods.getGoodNum())) - { - return R.fail("商品库存不足"); - } - else - { - int goodNum=Integer.valueOf(goods.getGoodNum()); - if(goodNum<=0) - { - return R.fail("商品库存不足"); - } +// if(StringUtils.isEmpty(goods.getGoodNum())) +// { +// return R.fail("商品库存不足"); +// } +// else +// { +// int goodNum=Integer.valueOf(goods.getGoodNum()); +// if(goodNum<=0) +// { +// return R.fail("商品库存不足"); +// } +// +// goodNum--; +// +// VolunteerIntegralMerchantVO vo=new VolunteerIntegralMerchantVO(); +// vo.setId(goods.getId()); +// vo.setGoodNum(goodNum+""); +// goodsService.updateById(vo); +// } - goodNum--; - VolunteerIntegralMerchantVO vo=new VolunteerIntegralMerchantVO(); - vo.setId(goods.getId()); - vo.setGoodNum(goodNum+""); - goodsService.updateById(vo); - } + //增加积分明细记录 + VolunteerIntegralRecordVO virvo=new VolunteerIntegralRecordVO(); + virvo.setUserId(loginUserInfoVOR.getUserId()+""); + virvo.setIType("2"); + virvo.setIntegral(item.getPalyIntegral()); + virvo.setCommunityId(item.getCommunityId()); + virService.insertVolunteer(virvo); int num1=integral-Integer.valueOf(goods.getIntegral()); @@ -172,30 +193,35 @@ return R.fail("兑换用户id不能为空"); } - if(StringUtils.isEmpty(goods.getGoodNum())) - { - return R.fail("商品库存不足"); - } - else - { - int goodNum=Integer.valueOf(goods.getGoodNum()); - if(goodNum<=0) - { - return R.fail("商品库存不足"); - } + //增加积分明细记录 + VolunteerIntegralRecordVO virvo=new VolunteerIntegralRecordVO(); + virvo.setUserId(loginUserInfoVOR.getUserId()+""); + virvo.setIType("3"); + virvo.setIntegral(item.getPalyIntegral()); + virvo.setCommunityId(item.getCommunityId()); + virService.insertVolunteer(virvo); - goodNum--; - - VolunteerIntegralMerchantVO vo=new VolunteerIntegralMerchantVO(); - vo.setId(goods.getId()); - vo.setGoodNum(goodNum+""); - goodsService.updateById(vo); - } - - + //修改个人积分 int num1=integral-Integer.valueOf(item.getPalyIntegral()); loginUserInfoVOR.setLoveIntegral(num1+""); userService.putUser(loginUserInfoVOR); + + + //修改商家积分 + R<VolunteerMerchant> vm= vmService.getById(item.getMerchantId()); + + int vmNum=0; + if(!StringUtils.isEmpty(vm.getData().getMerchantIntegral())) + { + vmNum=Integer.valueOf(vm.getData().getMerchantIntegral()); + } + + vmNum+=Integer.valueOf(item.getPalyIntegral()); + + VolunteerMerchantVO vmvo=new VolunteerMerchantVO(); + vmvo.setId(item.getMerchantId()); + vmvo.setMerchantIntegral(vmNum+""); + vmService.updateVolunteerMerchant(vmvo); item.setCondition("3"); //设置订单号 @@ -269,4 +295,59 @@ } return R.fail("操作失败"); } + + /** + * 社区订单取消 + * @param id 订单iD + * @return + */ + @Override + public R communityCancellation(String id) + { + if(StringUtils.isEmpty(id)) + { + return R.fail("订单id不能为空"); + } + //查询订单 + VolunteerCreditsExchange vce=baseMapper.getData(id); + if(StringUtils.equals("0",vce.getCondition())) + { + //修改订单状态为取消 + VolunteerCreditsExchangeVO volunteerCreditsExchangeVO=new VolunteerCreditsExchangeVO(); + volunteerCreditsExchangeVO.setId(id); + volunteerCreditsExchangeVO.setCondition("2"); + baseMapper.update(volunteerCreditsExchangeVO); + + //查询用户详情 + LoginUserInfoVO loginUserInfoVOR=userService.getUserInfoByUserId(vce.getUserId()).getData(); + int integral=0; + if(!StringUtils.isEmpty(loginUserInfoVOR.getLoveIntegral())) + { + integral=Integer.valueOf(loginUserInfoVOR.getLoveIntegral()); + } + integral=integral+Integer.valueOf(vce.getPalyIntegral()); + loginUserInfoVOR.setLoveIntegral(integral+""); + userService.putUser(loginUserInfoVOR); + + //更新商品库存 + VolunteerIntegralMerchant goods=goodsService.queryById(vce.getGoodsId()); + VolunteerIntegralMerchantVO vimvo=new VolunteerIntegralMerchantVO(); + int goodNum=Integer.valueOf(goods.getGoodNum()); + goodNum++; + vimvo.setId(goods.getId()); + vimvo.setGoodNum(goodNum+""); + goodsService.updateById(vimvo); + + //增加积分明细记录 + VolunteerIntegralRecordVO virvo=new VolunteerIntegralRecordVO(); + virvo.setUserId(loginUserInfoVOR.getUserId()+""); + virvo.setIType("4"); + virvo.setIntegral(vce.getPalyIntegral()); + virvo.setCommunityId(vce.getCommunityId()); + virService.insertVolunteer(virvo); + } + return R.fail("订单不是未核销订单"); + } + + } -- Gitblit v1.7.1