diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java index 3232a6e17..e1d0916fe 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java @@ -6,10 +6,12 @@ import org.apache.ibatis.annotations.Param; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxOrderPress; +import com.iformall.domain.vo.WxOrderPressVo; public interface WxOrderPressMapper extends CommonMapper { WxOrderPress selectById(@Param("id")Long id,@Param("tenantId")String tenantId); List findList(WxOrderPress wxOrderPress); + List findPressList(Map paramMap); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 8346d0d92..76a330d08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1928,7 +1928,15 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public WxOrderCouponPressVo detailPressVo(WxOrder record) { - return wxOrderMapper.selectDetailOfPress(record); + WxOrderCouponPressVo pressVo = wxOrderMapper.selectDetailOfPress(record); + if (null != pressVo) { + Map paramMap = new HashMap(); + paramMap.put("orderId", record.getId()); + paramMap.put("tenantId", record.getTenantId()); + paramMap.put("finalTenantId", record.getFinalTenantId()); + pressVo.setOrderPressList(wxOrderPressMapper.findPressList(paramMap)); + } + return pressVo; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 2fe48f030..efe8fd6e7 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -206,7 +206,7 @@ - @@ -304,7 +304,7 @@ - diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 853cddeb2..942ab5990 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -618,7 +618,7 @@ - diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 62b0396cb..c749ce29b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -688,7 +688,7 @@ - @@ -1052,7 +1052,7 @@ - @@ -1254,7 +1254,7 @@ - @@ -1315,7 +1315,7 @@ - diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 2c66bd872..3051a76ce 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -316,7 +316,7 @@ - @@ -906,11 +906,11 @@ - - + --> diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index 223f0354f..f54879aa5 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -55,4 +55,31 @@ select from wx_order_press + + + + + + + + + + + + + + + + op.`id`,op.`order_id`,op.`user_id`,op.`press_value`,op.`create_date`,op.`first`, + cu.`nick_name`, cu.`avatar_url` + + +