Explorar el Código

fix bug

release_toaliyun_real
xiaohanzi hace 4 años
padre
commit
aaf985887f
Se han modificado 3 ficheros con 5 adiciones y 2 borrados
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java Ver fichero

@@ -16,8 +16,8 @@ public class WxCouponMerchant extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value="",name="productId") @io.swagger.annotations.ApiModelProperty(value="",name="productId")
private Long 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") @io.swagger.annotations.ApiModelProperty(value="",name="parameter")
private String parameter; private String parameter;




+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Ver fichero

@@ -1528,6 +1528,8 @@ public class WxOrderServiceImpl implements WxOrderService {
if (list.size() > 1) { if (list.size() > 1) {
creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode())); creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode()));
} }
}else {
creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode()));
} }
} }




+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java Ver fichero

@@ -96,6 +96,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
if (wxOrder.getType().equals(EnumOrderType.COUPON.getCode())) { if (wxOrder.getType().equals(EnumOrderType.COUPON.getCode())) {
WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrder.getProductId(),wxOrder.getTenantId()); WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrder.getProductId(),wxOrder.getTenantId());
if (wxCoupon != null) { if (wxCoupon != null) {
//如券包就没有商户
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); WxCouponMerchant wxCouponMerchant = new WxCouponMerchant();
wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setProductId(wxCoupon.getId());
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());


Cargando…
Cancelar
Guardar