From 55ebd09d3c1ade1a96d1908671fae8aef57ab511 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 15:17:55 +0800 Subject: [PATCH] =?UTF-8?q?B,C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8CB=E7=AB=AF=E8=AE=A2=E5=8D=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UserApplication.java => BApplication.java} | 4 +- .../simple/controller/WxOrderController.java | 20 ++--- ...UserApplication.java => CApplication.java} | 4 +- .../java/com/simple/domain/vo/OrderVo.java | 76 +++++++++++++++++++ .../java/com/simple/mapper/WxOrderMapper.java | 5 +- .../com/simple/service/WxOrderService.java | 11 ++- .../service/impl/WxOrderServiceImpl.java | 11 ++- .../main/resources/mapper/WxOrderMapper.xml | 24 ++++-- 8 files changed, 124 insertions(+), 31 deletions(-) rename mallinkBApi/src/main/java/com/simple/{UserApplication.java => BApplication.java} (83%) rename mallinkCApi/src/main/java/com/simple/{UserApplication.java => CApplication.java} (83%) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java diff --git a/mallinkBApi/src/main/java/com/simple/UserApplication.java b/mallinkBApi/src/main/java/com/simple/BApplication.java similarity index 83% rename from mallinkBApi/src/main/java/com/simple/UserApplication.java rename to mallinkBApi/src/main/java/com/simple/BApplication.java index a16a60136..0b399ffbd 100644 --- a/mallinkBApi/src/main/java/com/simple/UserApplication.java +++ b/mallinkBApi/src/main/java/com/simple/BApplication.java @@ -13,9 +13,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 -public class UserApplication { +public class BApplication { public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); + SpringApplication.run(BApplication.class, args); } } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index 2d488ec3d..99cb4d533 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -27,35 +28,36 @@ public class WxOrderController extends BaseController { private WxOrderService wxOrderService; @GetMapping("list") - @ApiOperation(value = "券查询接口", notes="{\"pageNum\":int,\"pageSize\":int," + - "\"merchantId\":Long,\"cUserId\":Long,"+ - "\"status\":int,\"couponStatus\":int}") + @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 = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = false), @ApiImplicitParam(name = "status", 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(@RequestBody Map params) { - final PageInfo> page = wxOrderService.bQueryListMap(params); + public ResultData list(@ModelAttribute OrderVo orderVo, Integer pageNum, Integer pageSize) { + final PageInfo> page = wxOrderService.bQueryListMap(orderVo, pageNum, pageSize); return new ResultData(page); } @ApiOperation("订单详情") - @PostMapping("detail") + @GetMapping("detail") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = false), @ApiImplicitParam(name = "status", 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 orderDetail(@RequestBody Map params) { + public ResultData orderDetail(@ModelAttribute OrderVo orderVo) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - Map map = wxOrderService.queryObject(params); + Map map = wxOrderService.queryObject(orderVo); return new ResultData(map); } diff --git a/mallinkCApi/src/main/java/com/simple/UserApplication.java b/mallinkCApi/src/main/java/com/simple/CApplication.java similarity index 83% rename from mallinkCApi/src/main/java/com/simple/UserApplication.java rename to mallinkCApi/src/main/java/com/simple/CApplication.java index a16a60136..6e64298dd 100644 --- a/mallinkCApi/src/main/java/com/simple/UserApplication.java +++ b/mallinkCApi/src/main/java/com/simple/CApplication.java @@ -13,9 +13,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 -public class UserApplication { +public class CApplication { public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); + SpringApplication.run(CApplication.class, args); } } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java new file mode 100644 index 000000000..72bf2ec2a --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java @@ -0,0 +1,76 @@ +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="orderId") + private Long orderId; + /*卡券ID**/ + @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") + private Long couponId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*c端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") + private Long cUserId; + /*订单状态**/ + @io.swagger.annotations.ApiModelProperty(value="订单状态",name="status") + private Integer status; + /*券状态**/ + @io.swagger.annotations.ApiModelProperty(value="券状态",name="status") + private Integer couponStatus; + + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long _orderId) { + orderId = _orderId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + 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 9a8e6b320..063ac1807 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.OrderVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxOrder; @@ -9,8 +10,8 @@ public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - List> queryListMap(Map params); + List> queryListMap(OrderVo orderVo); - Map queryObject(Map params); + Map queryObject(OrderVo orderVo); } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index b369daae3..8611a7aac 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -3,6 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; public interface WxOrderService { @@ -20,17 +21,19 @@ public interface WxOrderService { /** * 根据实体查询分页列表 * - * @param params + * @param orderVo + * @param pageIndex + * @param pageSize * @return */ - PageInfo> bQueryListMap(Map params); + PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize); /** * 查询券详情 - * @param params + * @param orderVo * @return */ - Map queryObject(Map params); + 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 9ec63109e..6141cbc7a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; import com.simple.exception.MallinkException; import com.simple.mapper.WxCouponMapper; @@ -36,15 +37,13 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public PageInfo> bQueryListMap(Map params) { - Integer pageIndex = (Integer) params.get("pageIndex"); - Integer pageSize = (Integer) params.get("pageSize"); - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(params)); + public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(orderVo)); } @Override - public Map queryObject(Map params) { - return wxOrderMapper.queryObject(params); + public Map queryObject(OrderVo orderVo) { + return wxOrderMapper.queryObject(orderVo); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 11d5da2e9..5aff7862a 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -103,7 +103,7 @@ - select o.id, o.coupon_id, c.title, v.verification_date, o.c_user_id, u.phone, u.nick_name, c.price, c.sale_price, o.status, o.coupon_status @@ -112,20 +112,26 @@ left join wx_coupon_verify v on v.coupon_id= o.coupon_id left join wx_c_user u on u.id = o.c_user_id + + and c.`tenant_id` = #{tenantId} + and c.`merchant_id` = #{merchantId} and o.`id` = #{orderId} + + and o.`coupon_id` = #{couponId} + and o.`c_user_id` = #{cUserId} - and o.status=#{status} + and o.`status` = #{status} - and o.coupon_status=#{couponStatus} + and o.`coupon_status` = #{couponStatus} @@ -135,7 +141,7 @@ - select o.id, o.coupon_id, c.title, c.sub_title, v.verification_date, o.c_user_id, o.create_date, u.phone, u.nick_name, c.price, c.sale_price, o.status, o.coupon_status, c.remark @@ -144,20 +150,26 @@ left join wx_coupon_verify v on v.coupon_id= o.coupon_id left join wx_c_user u on u.id = o.c_user_id + + and c.`tenant_id` = #{tenantId} + and c.`merchant_id` = #{merchantId} and o.`id` = #{orderId} + + and o.`coupon_id` = #{couponId} + and o.`c_user_id` = #{cUserId} - and o.status=#{status} + and o.`status` = #{status} - and o.coupon_status=#{couponStatus} + and o.`coupon_status` = #{couponStatus}