diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index ac9075622..86cdd8872 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxMerchantCorp; +import com.iformall.domain.po.WxPark; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; @@ -216,5 +217,5 @@ public interface WxMerchantService { Map findMerchantMap(WxMerchant merchantQ); - WxMerchant findParkMerchant(TenantEntity tenantEntity); + WxMerchant findParkMerchant(WxPark wxPark); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 21fa23be4..889119478 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1973,14 +1973,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { } @Override - public WxMerchant findParkMerchant(TenantEntity tenantEntity) { + public WxMerchant findParkMerchant(WxPark wxPark) { WxMerchant record = null; - String key = Constant.parkMerchantPrev + tenantEntity.getTenantId(); + String key = Constant.parkMerchantPrev + wxPark.getTenantId(); record = RedisCacheUtils.getCacheObject(redisTemplate, key, WxMerchant.class); if(record == null){ WxMerchant merchantQ = new WxMerchant(); - merchantQ.updateTenantInfo(tenantEntity); - merchantQ.setHasCarVendor(1); + merchantQ.updateTenantInfo(wxPark); + merchantQ.setCarVendorType(wxPark.getVendorType()); + merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); + merchantQ.setIsDel(EnumYesOrNo.NO.getCode()) ; List merchantList = wxMerchantMapper.findList(merchantQ); if (null != merchantList && merchantList.size() > 0 ) { record = merchantList.get(0);