Bläddra i källkod

fix car pay

release_toaliyun_real
lin 3 år sedan
förälder
incheckning
a0aa1a436b
3 ändrade filer med 30 tillägg och 2 borttagningar
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +26
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Visa fil

@@ -283,8 +283,8 @@ public class WxMerchantController extends BaseController {
if (null == wxMerchant.getId() || StringUtils.isBlank(wxMerchant.getAccount()) || StringUtils.isBlank(wxMerchant.getApiKey())) { if (null == wxMerchant.getId() || StringUtils.isBlank(wxMerchant.getAccount()) || StringUtils.isBlank(wxMerchant.getApiKey())) {
return new ResultData(ResultData.ERROR,"参数缺失"); return new ResultData(ResultData.ERROR,"参数缺失");
} }
return null;
wxMerchant.updateTenantInfo(getTenantInfo());
return wxMerchantService.setWxMerchantAccount(wxMerchant);
} }


@ApiOperation("查询当前租户下商户名称列表") @ApiOperation("查询当前租户下商户名称列表")


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Visa fil

@@ -153,6 +153,8 @@ public interface WxMerchantService {
ResultData updateMerchantTax(WxMerchant wxMerchant); ResultData updateMerchantTax(WxMerchant wxMerchant);


ResultData updateMerchantLevel(WxMerchant wxMerchant); ResultData updateMerchantLevel(WxMerchant wxMerchant);
ResultData setWxMerchantAccount(WxMerchant wxMerchant);


WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id); WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id);




+ 26
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Visa fil

@@ -85,6 +85,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Lazy @Lazy
@Autowired @Autowired
WxProfitSharingReceiverService wxProfitSharingReceiverService; WxProfitSharingReceiverService wxProfitSharingReceiverService;
@Lazy
@Autowired
WxProfitPaymentReceiverService wxProfitPaymentReceiverService;


@Autowired @Autowired
WxBillDepositMapper wxBillDepositMapper; WxBillDepositMapper wxBillDepositMapper;
@@ -928,6 +932,28 @@ public class WxMerchantServiceImpl implements WxMerchantService {
} }
return new ResultData(Result.SUCCESS, "操作成功"); return new ResultData(Result.SUCCESS, "操作成功");
} }
@Override
public ResultData setWxMerchantAccount(WxMerchant wxMerchant) {
try {
WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(wxMerchant, wxMerchant.getId(),EnumAppPlat.WX);
if (null == receiver ) {
receiver = new WxProfitPaymentReceiver();
receiver.setMerchantId(wxMerchant.getId());
receiver.setReceiverType();
receiver.setReceiverComments("手动设置收款账号");
receiver.setStatus();
receiver.setPlat(EnumAppPlat.WX.getCode());
}
receiver.setReceiverAccount(wxMerchant.getAccount());
receiver.setApiKey(wxMerchant.getApiKey());
wxProfitPaymentReceiverService.saveOrUpdate(receiver);
} catch (Exception e) {
logger.error("db failed: 账号操作失败, e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
return new ResultData(Result.SUCCESS, "操作成功");
}


@Override @Override
public WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id) { public WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id) {


Laddar…
Avbryt
Spara