Просмотр исходного кода

//sharing

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
43defa41ad
8 измененных файлов: 12 добавлений и 15 удалений
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java
  3. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  4. +1
    -2
      mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java
  5. +4
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -76,7 +76,7 @@ public class WxMerchantController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空");
}
wxMerchant.updateTenantInfo(getTenantInfo());
return new ResultData(wxProfitPaymentReceiverService.findReceiver(getTenantInfo(),wxMerchant.getId(), EnumAppPlat.TOUTIAO,EnumProfitPaymentReceiverType.tt_merchant_number));
return new ResultData(wxProfitPaymentReceiverService.findReceiver(getTenantInfo(),wxMerchant.getId(), EnumAppPlat.TOUTIAO));
}

@ApiOperation("更新收款账户信息:必填项 id(商户ID) name(商户名称) accountId(账号ID) accountTypeValue(账号类型) accountName(账号名称)")


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java Просмотреть файл

@@ -87,7 +87,7 @@ public class WxProfitSharingReceiverApplyController extends BaseController {
if(merchant == null || EnumMerchantStatus.NOT_VALID.getCode().equals(merchant.getStatus())){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID.getCode(),"商户不存在或已停用");
}
WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number);
WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX);
if(receiver != null && MerchantImportStatus.improt_success.getCode().equals(receiver.getWxImportStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该商户已进件成功");
}


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -468,14 +468,14 @@ public class WxCarController extends BaseController {
return new ResultData(Result.ERROR,"未设置停车商户.");
}
WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number);
WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX);
if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) {
//查询商官商户
WxMerchant adminMerchant = wxMerchantService.findAdmin(park);
if (null == adminMerchant) {
return new ResultData(Result.ERROR,"未找到商管商户.");
}
receiver = wxProfitPaymentReceiverService.findReceiver(park, adminMerchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number);
receiver = wxProfitPaymentReceiverService.findReceiver(park, adminMerchant.getId(), EnumAppPlat.WX);
if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) {
return new ResultData(Result.ERROR,"商管商户未设置收款账号.");
}


+ 1
- 2
mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java Просмотреть файл

@@ -49,10 +49,9 @@ public interface WxProfitPaymentReceiverService {
* @param tenantEntity
* @param merchantId
* @param plat
* @param receiverType
* @return
*/
WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat, EnumProfitPaymentReceiverType receiverType);
WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat);


ResultData updateReceiver(WxProfitPaymentReceiver receiver);


+ 4
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java Просмотреть файл

@@ -104,19 +104,18 @@ public class WxProfitPaymentReceiverServiceImpl implements WxProfitPaymentReceiv


@Override
public WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat,EnumProfitPaymentReceiverType receiverType) {
public WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat) {
WxProfitPaymentReceiver record = null;
String key = Constant.paymentReceicerPrev + tenantEntity.getTenantId()
+ ":" + plat.getCode()
+ ":" + merchantId
+ ":" + receiverType.getCode();
+ ":" + merchantId;
record = RedisCacheUtils.getCacheObject(paymentReceicerRedisTemplate, key, WxProfitPaymentReceiver.class);
if(record == null){
WxProfitPaymentReceiver receiver = new WxProfitPaymentReceiver();
receiver.updateTenantInfo(tenantEntity);
receiver.setMerchantId(merchantId);
receiver.setPlat(plat.getCode());
receiver.setReceiverType(receiverType.getCode());
// receiver.setReceiverType(receiverType.getCode());
receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode());
record = wxProfitPaymentReceiverMapper.findOne(receiver);
if(record != null){
@@ -317,8 +316,7 @@ public class WxProfitPaymentReceiverServiceImpl implements WxProfitPaymentReceiv
if(receiver != null){
String key = Constant.paymentReceicerPrev + receiver.getTenantId()
+ ":" + receiver.getPlat()
+ ":" + receiver.getMerchantId()
+ ":" + receiver.getReceiverType();
+ ":" + receiver.getMerchantId();
RedisCacheUtils.removeCache(paymentReceicerRedisTemplate, key);
}
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Просмотреть файл

@@ -346,7 +346,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{
return null;
}

WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.TOUTIAO,EnumProfitPaymentReceiverType.tt_merchant_number);
WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.TOUTIAO);
if(record != null && !MerchantImportStatus.improt_success.getCode().equals(record.getWxImportStatus())
&& !MerchantImportStatus.improt_success.getCode().equals(record.getAlipayImportStatus())
&& !MerchantImportStatus.improt_success.getCode().equals(record.getHzImportStatus())){


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java Просмотреть файл

@@ -377,7 +377,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{
if(merchantId == null || merchantId.equals(0L)){
return null;
}
WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitPaymentReceiverType.wx_special_merchant_number);
WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX);
return record;
}



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java Просмотреть файл

@@ -101,7 +101,7 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{
if(merchantId == null || merchantId.equals(0L)){
return null;
}
WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitPaymentReceiverType.wx_special_merchant_number);
WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX);
return record;
}



Загрузка…
Отмена
Сохранить