From 05dc0a11b395554ec3cfd9e37166677d2f685577 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 27 Aug 2018 17:05:13 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E5=88=A0=E9=99=A4]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=88=91=E7=94=A8=E7=9A=84=E8=AE=A2=E5=8D=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 117 ------------------ .../java/com/simple/domain/vo/OrderVo.java | 96 -------------- .../java/com/simple/mapper/WxOrderMapper.java | 5 - .../com/simple/service/WxOrderService.java | 17 --- .../service/impl/WxOrderServiceImpl.java | 10 -- .../main/resources/mapper/WxOrderMapper.xml | 80 ------------ 6 files changed, 325 deletions(-) delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java delete mode 100644 mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java deleted file mode 100644 index bc2890051..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.simple.controller; - -import com.simple.common.ErrorCode; -import com.simple.domain.po.WxMerchantBUser; -import com.simple.domain.vo.OrderVo; -import com.simple.enums.EnumOrderStatus; -import io.swagger.annotations.Api; -import io.swagger.models.auth.In; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; - -import com.simple.domain.po.WxOrder; -import com.simple.service.WxOrderService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -import java.util.Map; - -@RestController -@RequestMapping("/order") -@Api(description="订单相关接口") -public class WxOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxOrderController.class); - - @Autowired - private WxOrderService wxOrderService; - - @GetMapping("list") - @ApiOperation(value = "券查询接口", notes="") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "orderStatus", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), - @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") - }) - public ResultData list(Integer orderStatus, Integer couponStatus, Integer pageNum, Integer pageSize) { - WxMerchantBUser user = getUser(); - OrderVo orderVo = new OrderVo(); - orderVo.setbUserId(user.getId()); - if (orderStatus != -1) - orderVo.setOrderStatus(orderStatus); - if (couponStatus != -1) - orderVo.setCouponStatus(couponStatus); - final PageInfo> page = wxOrderService.bQueryListMap(orderVo, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation(value = "订单详情", notes = "{\"couponOrderId\":\"String\",\"orderId\":\"String\",\"couponId\":\"String\"}") - @GetMapping("detail") - public ResultData orderDetail(@RequestBody Map paramMap) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String couponOrderIdStr = paramMap.get("couponOrderId"); - String orderIdStr = paramMap.get("orderId"); - String couponIdStr = paramMap.get("couponId"); - if (StringUtils.isBlank(couponOrderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); - } - if (StringUtils.isBlank(orderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); - } - if (StringUtils.isBlank(couponIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); - } - Long couponOrderId = 0L, orderId = 0L, couponId = 0L; - try { - couponOrderId = Long.valueOf(couponOrderIdStr); - orderId = Long.valueOf(orderIdStr); - couponId = Long.valueOf(couponIdStr); - } catch (NumberFormatException e) { - logger.error("couponOrderId " + couponOrderIdStr + ", e:" + e.getMessage()); - } - WxMerchantBUser user = getUser(); - OrderVo orderVo = new OrderVo(); - orderVo.setbUserId(user.getId()); - orderVo.setOrderId(orderId); - orderVo.setCouponId(couponId); - Map map = wxOrderService.queryObject(orderVo); - return new ResultData(map); - } - - @ApiOperation(value = "手工退款", notes = "{\"orderId\":\"string\"}") - @PostMapping("refund") - public ResultData expiringOrder(@RequestBody Map paramMap) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String orderIdStr = paramMap.get("orderId"); - if (StringUtils.isBlank(orderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); - } - Long orderId = 0L; - try { - orderId = Long.valueOf(orderIdStr); - } catch (NumberFormatException e) { - logger.error("orderId " + orderIdStr + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); - } - try { - WxOrder order = wxOrderService.getById(orderId); - if (order != null) { - wxOrderService.updateOrderStatus(order, EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); - } - } catch (Exception e) { - logger.error("orderId " + orderIdStr + ", e:" + e.getMessage()); - } - - return new ResultData(); - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java deleted file mode 100644 index 4ff8f3e6a..000000000 --- a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.simple.domain.vo; - -import java.io.Serializable; - -public class OrderVo implements Serializable { - private static final long serialVersionUID = 1L; - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*商户ID**/ - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Long merchantId; - /*订单ID**/ - @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") - private Long orderId; - /*卡券ID**/ - @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") - private Long couponId; - /*c端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Long cUserId; - /*b端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") - private Long bUserId; - /*订单状态**/ - @io.swagger.annotations.ApiModelProperty(value="订单状态",name="orderStatus") - private Integer orderStatus; - /*券状态**/ - @io.swagger.annotations.ApiModelProperty(value="券状态",name="status") - private Integer couponStatus; - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - - public Integer getOrderStatus() { - return orderStatus; - } - - public void setOrderStatus(Integer orderStatus) { - this.orderStatus = orderStatus; - } - - public Integer getCouponStatus() { - return couponStatus; - } - - public void setCouponStatus(Integer couponStatus) { - this.couponStatus = couponStatus; - } -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index d90112eca..781ac4700 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -3,7 +3,6 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; import com.simple.domain.po.WxCouponOrder; -import com.simple.domain.vo.OrderVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxOrder; @@ -11,9 +10,5 @@ public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - List> queryListMap(OrderVo orderVo); - - Map queryObject(OrderVo orderVo); - List findListOfUnpaidOrderByDate(Map dateMap); } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index c0cfa1d22..ee4a228a9 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -4,7 +4,6 @@ import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxOrder; -import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; public interface WxOrderService { @@ -19,22 +18,6 @@ public interface WxOrderService { */ PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize); - /** - * 根据实体查询分页列表 - * - * @param orderVo - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize); - - /** - * 查询券详情 - * @param orderVo - * @return - */ - Map queryObject(OrderVo orderVo); /** * 提交订单 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index f0960f805..ce70bed53 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -8,7 +8,6 @@ import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxOrder; -import com.simple.domain.vo.OrderVo; import com.simple.enums.*; import com.simple.exception.MallinkException; import com.simple.mapper.*; @@ -61,15 +60,6 @@ public class WxOrderServiceImpl implements WxOrderService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); } - @Override - public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.queryListMap(orderVo)); - } - - @Override - public Map queryObject(OrderVo orderVo) { - return wxOrderMapper.queryObject(orderVo); - } private int getUserCouponOrderCount(WxCUser user, WxCoupon counpon) { // 用户购买的券包数量 diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f86f362c2..9d0ee784a 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -109,86 +109,6 @@ - - -