| | |
| | | return R.fail("商品所需积分不能为空"); |
| | | } |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getCommodityValue())) |
| | | { |
| | | return R.fail("商品价值不能为空"); |
| | | } |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getGoodNum())) |
| | | { |
| | | return R.fail("商品数量不能为空"); |
| | | } |
| | | |
| | | int num= merchantService.insertVolunteer(vimVO); |
| | | if(num>0) |
| | |
| | | vimVO.setCommunityId(getCommunityId()+""); |
| | | } |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getName())) |
| | | { |
| | | return R.fail("商品名称不能为空"); |
| | | } |
| | | |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getIntegral())) |
| | | { |
| | | return R.fail("商品所需积分不能为空"); |
| | | } |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getCommodityValue())) |
| | | { |
| | | return R.fail("商品价值不能为空"); |
| | | } |
| | | |
| | | int num= merchantService.updateById(vimVO); |
| | |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getState())) |
| | | { |
| | | return R.fail("商品上下架状态不能为空"); |
| | | vimVO.setState("1"); |
| | | } |
| | | |
| | | if(StringUtils.isEmpty(vimVO.getCommunityId())) |
| | |
| | | @RequestParam(value = "userName", required = false) String userName, |
| | | @RequestParam(value = "communityId", required = false) String communityId, |
| | | @RequestParam(value = "userId", required = false) String userId, |
| | | @RequestParam(value = "orderType", required = false) String orderType) |
| | | @RequestParam(value = "orderType", required = false) String orderType, |
| | | @RequestParam(value = "merchantId", required = false) String merchantId) |
| | | { |
| | | return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,communityId,userId,orderType); |
| | | condition,userName,communityId,userId,orderType,merchantId); |
| | | } |
| | | |
| | | /** |
| | |
| | | } |
| | | |
| | | |
| | | |
| | | /** |
| | | * 社区取消订单 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @GetMapping("/order/communityCancellation") |
| | | public R communityCancellation(@RequestParam("id") String id) |
| | | { |
| | | if(StringUtils.isEmpty(id)) |
| | | { |
| | | return R.fail("订单id不能为空"); |
| | | } |
| | | return vceService.communityCancellation(id); |
| | | } |
| | | |
| | | |
| | | } |