diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 4fb7714e9..5523a44d5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @RestController @@ -316,7 +317,7 @@ public class WxOrderController extends BaseController { } wxOrder.setId(id); wxOrder.setcUserId(getUser().getId()); - WxOrderCouponPressVo orderCouponPressVo = wxOrderService.detailPressVo(wxOrder); + final WxOrderCouponPressVo orderCouponPressVo = wxOrderService.detailPressVo(wxOrder); if (orderCouponPressVo == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); return new ResultData(orderCouponPressVo); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index e4a3c39b4..40aba8ca2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -1,10 +1,12 @@ package com.iformall.domain.vo; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderPress; import java.util.List; +@JsonIgnoreProperties(value = {"handler"}) public class WxOrderCouponPressVo extends WxOrder { /** 券ID-产品ID将来的产品都会放在coupon表里**/ @@ -168,4 +170,6 @@ public class WxOrderCouponPressVo extends WxOrder { public void setOrderPressList(List orderPressList) { this.orderPressList = orderPressList; } + + } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 62e940786..43edb6833 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -584,6 +584,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select from wx_coupon c,wx_order o @@ -623,7 +657,7 @@ order by ${sortColumns} - select FROM wx_order o