| | |
| | | @RequestParam(value = "userName", required = false) String userName) |
| | | { |
| | | return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,null,getLoginUserInfo().getUserId()+""); |
| | | condition,userName,null,getLoginUserInfo().getUserId()+"","1"); |
| | | } |
| | | |
| | | /** |
| | |
| | | @RequestParam(value = "condition", required = false) String condition, |
| | | @RequestParam(value = "userName", required = false) String userName, |
| | | @RequestParam(value = "communityId", required = false) String communityId, |
| | | @RequestParam(value = "userId", required = false) String userId); |
| | | @RequestParam(value = "userId", required = false) String userId, |
| | | @RequestParam(value = "orderType", required = true) String orderType); |
| | | |
| | | /** |
| | | * 查询详情 |
| | |
| | | * @param |
| | | * @return |
| | | */ |
| | | @GetMapping("order/getList") |
| | | @GetMapping("/order/getList") |
| | | public R getList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "goodsId", required = false) String goodsId, |
| | |
| | | @RequestParam(value = "userName", required = false) String userName) |
| | | { |
| | | return merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,getCommunityId()+"",null); |
| | | condition,userName,getCommunityId()+"",null,"1"); |
| | | } |
| | | |
| | | /** |
| | |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @GetMapping("order/getData") |
| | | @GetMapping("/order/getData") |
| | | public R getData(@RequestParam("id") String id) |
| | | { |
| | | if(StringUtils.isEmpty(id)) |
| | |
| | | @RequestParam(value = "condition", required = false) String condition, |
| | | @RequestParam(value = "userName", required = false) String userName, |
| | | @RequestParam(value = "communityId", required = false) String communityId, |
| | | @RequestParam(value = "userId", required = false) String userId) |
| | | @RequestParam(value = "userId", required = false) String userId, |
| | | @RequestParam(value = "orderType", required = true) String orderType) |
| | | { |
| | | return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,communityId,userId); |
| | | condition,userName,communityId,userId,orderType); |
| | | } |
| | | |
| | | /** |
| | |
| | | @Param("condition") String condition, |
| | | @Param("userName") String userName, |
| | | @Param("communityId") String communityId, |
| | | @Param("userId") String userId |
| | | @Param("userId") String userId, |
| | | @Param("orderType") String orderType |
| | | ); |
| | | |
| | | /** |
| | |
| | | String condition, |
| | | String userName, |
| | | String communityId, |
| | | String userId |
| | | String userId, |
| | | String orderType |
| | | |
| | | ); |
| | | |
| | |
| | | |
| | | @Override |
| | | public R getList(int pageNum, int pageSize, String goodsId, String orderNumber, |
| | | String goodsName, String condition, String userName,String communityId,String userId) { |
| | | String goodsName, String condition, String userName,String communityId, |
| | | String userId,String orderType) { |
| | | |
| | | Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize); |
| | | return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,userName,communityId,userId)); |
| | | return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition, |
| | | userName,communityId,userId,orderType)); |
| | | } |
| | | |
| | | @Override |
| | |
| | | user_id, |
| | | </if> |
| | | <if test="item.condition != null"> |
| | | condition, |
| | | volunteer_credits_exchange.condition, |
| | | </if> |
| | | <if test="item.disposeTime != null"> |
| | | dispose_time, |
| | |
| | | user_id=#{item.userId}, |
| | | </if> |
| | | <if test="item.condition != null"> |
| | | condition=#{item.condition}, |
| | | volunteer_credits_exchange.condition=#{item.condition}, |
| | | </if> |
| | | <if test="item.disposeTime != null"> |
| | | dispose_time=#{item.disposeTime}, |