springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -57,6 +57,12 @@ { return R.fail("商品价值不能为空"); } if(StringUtils.isEmpty(vimVO.getGoodNum())) { return R.fail("商品数量不能为空"); } vimVO.setGoodType("0"); return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO); } @@ -68,6 +74,12 @@ { return R.fail("商品价值不能为空"); } if(StringUtils.isEmpty(vimVO.getGoodNum())) { return R.fail("商品数量不能为空"); } vimVO.setGoodType("0"); return merchantService.VolunteerIntegralMerchantUpdateById(vimVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -125,6 +125,10 @@ @PostMapping("/insertVolunteer") public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO) { if(StringUtils.isEmpty(vimVO.getMerchantId())) { return R.fail("商家id不能为空"); } vimVO.setGoodType("1"); return vtService.VolunteerIntegralMerchantInsertVolunteer(vimVO); } @@ -132,6 +136,10 @@ @PostMapping("/updateById") public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO) { if(StringUtils.isEmpty(vimVO.getMerchantId())) { return R.fail("商家id不能为空"); } vimVO.setGoodType("1"); return vtService.VolunteerIntegralMerchantUpdateById(vimVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -86,11 +86,6 @@ if(StringUtils.isEmpty(vimVO.getGoodNum())) { return R.fail("商品数量不能为空"); } int num= merchantService.insertVolunteer(vimVO); if(num>0) { @@ -118,12 +113,6 @@ { vimVO.setCommunityId(getCommunityId()+""); } if(StringUtils.isEmpty(vimVO.getName())) { return R.fail("商品名称不能为空"); } if(StringUtils.isEmpty(vimVO.getIntegral())) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -172,27 +172,6 @@ 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("商品库存不足"); } 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);