Browse Source

fix car pay

release_toaliyun_real
lin 3 years ago
parent
commit
873831b005
2 changed files with 8 additions and 5 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  2. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java View File

@@ -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<Long, WxMerchant> findMerchantMap(WxMerchant merchantQ);
WxMerchant findParkMerchant(TenantEntity tenantEntity);
WxMerchant findParkMerchant(WxPark wxPark);
}

+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -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<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ);
if (null != merchantList && merchantList.size() > 0 ) {
record = merchantList.get(0);


Loading…
Cancel
Save