diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java index 618fa729e..ef65b5e42 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java @@ -16,8 +16,8 @@ public class WxCouponMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="",name="productId") private Long productId; - @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") - private Long merchantId; +// @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") +// private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="",name="parameter") private String parameter; 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 749e30343..602cec4ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1528,6 +1528,8 @@ public class WxOrderServiceImpl implements WxOrderService { if (list.size() > 1) { creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode())); } + }else { + creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode())); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 290037bdf..415d5c8a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -96,6 +96,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { if (wxOrder.getType().equals(EnumOrderType.COUPON.getCode())) { WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrder.getProductId(),wxOrder.getTenantId()); if (wxCoupon != null) { + //如券包就没有商户 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());