From e3c72ee83aa8b857d17d0e79a43c89d3c267f9f9 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 20 十一月 2023 16:29:40 +0800 Subject: [PATCH] 商城订单模块 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java index cce4ad3..6282607 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java @@ -7,7 +7,9 @@ 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; @@ -655,6 +657,117 @@ } + /******************************************************************************************************************* + * + * 商品订单 + * + ****************************************************************************************************************/ + /** + * 分页查询 + * @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); + } + + + + } -- Gitblit v1.7.1