| | |
| | | import com.panzhihua.common.model.vos.community.ComActMicroWishVO; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO; |
| | | import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO; |
| | | import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; |
| | | import com.panzhihua.common.model.vos.user.SysUserNoticeVO; |
| | | import com.panzhihua.common.service.community.CommunityService; |
| | |
| | | } |
| | | |
| | | |
| | | /******************************************************************************************************************* |
| | | * |
| | | * 商品订单 |
| | | * |
| | | ****************************************************************************************************************/ |
| | | /** |
| | | * 分页查询 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单列表", response = NewFightShoppingOrderVO.class) |
| | | @GetMapping("/orderGetList") |
| | | public R orderGetList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "userId", required = false)String userId, |
| | | @RequestParam(value = "goodsId", required = false)String goodsId, |
| | | @RequestParam(value = "orderNumber", required = false)String orderNumber, |
| | | @RequestParam(value = "goodName", required = false)String goodName, |
| | | @RequestParam(value = "name", required = false)String name, |
| | | @RequestParam(value = "cancelType", required = false)String cancelType) |
| | | { |
| | | return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber, |
| | | goodName,name,cancelType,getCommunityId()+""); |
| | | } |
| | | |
| | | /** |
| | | * 分页详情 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单详情", response = NewFightShoppingOrderVO.class) |
| | | @GetMapping("/orderGetDetails") |
| | | public R orderGetDetails(@RequestParam("id") String id) |
| | | { |
| | | return newStriveForFeign.orderGetDetails(id,getCommunityId()+""); |
| | | } |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单添加") |
| | | @PostMapping("/orderAddData") |
| | | public R orderAddData(@RequestBody NewFightShoppingOrderVO item) |
| | | { |
| | | item.setCommunityId(getCommunityId()+""); |
| | | item.setUserId(getUserId()+""); |
| | | return newStriveForFeign.orderAddData(item); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 编辑 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单编辑", response = NewFightShoppingOrderVO.class) |
| | | @PostMapping("/NewFightOrder/orderEditData") |
| | | public R orderEditData(@RequestBody NewFightShoppingOrderVO item) |
| | | { |
| | | return newStriveForFeign.orderEditData(item); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 取消 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单取消") |
| | | @GetMapping("/orderCancelOrder") |
| | | public R orderCancelOrder(@RequestParam("orderId") String orderId) |
| | | { |
| | | return newStriveForFeign.orderCancelOrder(orderId,getCommunityId()+""); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 删除 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "订单删除") |
| | | @DeleteMapping("/orderExpurgateData") |
| | | public R orderExpurgateData(@RequestParam("id") String id) |
| | | { |
| | | return newStriveForFeign.orderExpurgateData(id,getCommunityId()+""); |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "订单核销") |
| | | @GetMapping("/orderCheck") |
| | | public R orderEditData(@RequestParam("id") String id) |
| | | { |
| | | |
| | | if(org.apache.commons.lang3.StringUtils.isEmpty(id)) |
| | | { |
| | | return R.fail("订单id不能为空"); |
| | | } |
| | | |
| | | NewFightShoppingOrderVO vo=new NewFightShoppingOrderVO(); |
| | | vo.setId(id); |
| | | vo.setCancelType("1"); |
| | | vo.setCancelTime(new Date()); |
| | | return newStriveForFeign.orderEditData(vo); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | } |