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

// add shar

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
09440c185c
2 измененных файлов: 11 добавлений и 2 удалений
  1. +10
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingType.java

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

@@ -38,7 +38,6 @@ public class WxProfitSharingReceiverApplyController extends BaseController {
if(receiverAdd == null){ if(receiverAdd == null){
receiverAdd = new WxProfitSharingReceiverApply(); receiverAdd = new WxProfitSharingReceiverApply();
} }
receiverAdd.updateTenantInfo(getTenantInfo());
if(receiverAdd.getMerchantId() == null){ if(receiverAdd.getMerchantId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空");
} }
@@ -46,6 +45,16 @@ public class WxProfitSharingReceiverApplyController extends BaseController {
if(merchant == null || EnumMerchantStatus.NOT_VALID.getCode().equals(merchant.getStatus())){ if(merchant == null || EnumMerchantStatus.NOT_VALID.getCode().equals(merchant.getStatus())){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID.getCode(),"商户不存在或已停用"); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID.getCode(),"商户不存在或已停用");
} }

receiverAdd.updateTenantInfo(merchant);
if(receiverAdd.getPlat() == null){
receiverAdd.setPlat(EnumAppPlat.WX.getCode());
}
EnumAppPlat enumPlat = EnumAppPlat.getByCode(receiverAdd.getPlat());
if(enumPlat == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "平台不合法");
}

WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX, EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT_v2); WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX, EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT_v2);
if(receiver != null && MerchantImportStatus.improt_success.getCode().equals(receiver.getWxImportStatus())){ if(receiver != null && MerchantImportStatus.improt_success.getCode().equals(receiver.getWxImportStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该商户已进件成功"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该商户已进件成功");


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

@@ -8,7 +8,7 @@ public enum EnumProfitSharingType {
PROFIT_SHARING_TYPE_BANK(2, "银行卡分账"), PROFIT_SHARING_TYPE_BANK(2, "银行卡分账"),


PROFIT_SHARING_TYPE_DOUYIN(3, "抖音进件"), PROFIT_SHARING_TYPE_DOUYIN(3, "抖音进件"),
PROFIT_SHARING_TYPE_WECHAT_v2(4, "微信进件"),
PROFIT_SHARING_TYPE_WECHAT_v2(4, "微信特约商户进件"),
; ;


public static EnumProfitSharingType getEnum(Integer code) { public static EnumProfitSharingType getEnum(Integer code) {


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