czg_team/newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
韩鹏辉
2024-02-28 11:43:17 +08:00
parent e22ad89baf
commit a90bf2f1ff
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
View File

@@ -2070,31 +2070,31 @@ public class HfMerService {
// " \"fee_rate\": \"0.007\"\n" + // " \"fee_rate\": \"0.007\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"wx_pub_offline\",\n" + // " \"rate_channel\": \"wx_pub_offline\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"wx_lite_online\",\n" + // " \"rate_channel\": \"wx_lite_online\",\n" +
// " \"fee_rate\": \"0.007\"\n" + // " \"fee_rate\": \"0.007\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"wx_lite_offline\",\n" + // " \"rate_channel\": \"wx_lite_offline\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"wx_scan\",\n" + // " \"rate_channel\": \"wx_scan\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_qr_online\",\n" + // " \"rate_channel\": \"alipay_qr_online\",\n" +
// " \"fee_rate\": \"0.007\"\n" + // " \"fee_rate\": \"0.007\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_qr_offline\",\n" + // " \"rate_channel\": \"alipay_qr_offline\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_scan\",\n" + // " \"rate_channel\": \"alipay_scan\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_lite_online\",\n" + // " \"rate_channel\": \"alipay_lite_online\",\n" +
// " \"fee_rate\": \"0.007\"\n" + // " \"fee_rate\": \"0.007\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_lite_offline\",\n" + // " \"rate_channel\": \"alipay_lite_offline\",\n" +
// " \"fee_rate\": \"0.0036\"\n" + // " \"fee_rate\": \"0.0038\"\n" +
// "}, {\n" + // "}, {\n" +
// " \"rate_channel\": \"alipay_call\",\n" + // " \"rate_channel\": \"alipay_call\",\n" +
// " \"fee_rate\": \"0.007\"\n" + // " \"fee_rate\": \"0.007\"\n" +
@@ -2314,31 +2314,31 @@ public class HfMerService {
" \"fee_rate\": \"0.007\"\n" + " \"fee_rate\": \"0.007\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"wx_pub_offline\",\n" + " \"rate_channel\": \"wx_pub_offline\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"wx_lite_online\",\n" + " \"rate_channel\": \"wx_lite_online\",\n" +
" \"fee_rate\": \"0.007\"\n" + " \"fee_rate\": \"0.007\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"wx_lite_offline\",\n" + " \"rate_channel\": \"wx_lite_offline\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"wx_scan\",\n" + " \"rate_channel\": \"wx_scan\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_qr_online\",\n" + " \"rate_channel\": \"alipay_qr_online\",\n" +
" \"fee_rate\": \"0.007\"\n" + " \"fee_rate\": \"0.007\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_qr_offline\",\n" + " \"rate_channel\": \"alipay_qr_offline\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_scan\",\n" + " \"rate_channel\": \"alipay_scan\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_lite_online\",\n" + " \"rate_channel\": \"alipay_lite_online\",\n" +
" \"fee_rate\": \"0.007\"\n" + " \"fee_rate\": \"0.007\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_lite_offline\",\n" + " \"rate_channel\": \"alipay_lite_offline\",\n" +
" \"fee_rate\": \"0.0036\"\n" + " \"fee_rate\": \"0.0038\"\n" +
"}, {\n" + "}, {\n" +
" \"rate_channel\": \"alipay_call\",\n" + " \"rate_channel\": \"alipay_call\",\n" +
" \"fee_rate\": \"0.007\"\n" + " \"fee_rate\": \"0.007\"\n" +
@@ -2561,14 +2561,14 @@ public class HfMerService {
MsgException.checkNull(idCard, "商户基本信息不完整"); MsgException.checkNull(idCard, "商户基本信息不完整");
Map<String, Object> f = HfMerService.fileUpload(idCard.getImgpositive(), "03", record.getMerchantid()); Map<String, Object> f = HfMerService.fileUpload(idCard.getImgpositive(), "02", record.getMerchantid());
if (ObjectUtil.isNotEmpty(f) && "succeeded".equals(f.get("status"))) { if (ObjectUtil.isNotEmpty(f) && "succeeded".equals(f.get("status"))) {
map.put("legalCertIdFrontId", f.get("pic_id")); map.put("legalCertIdFrontId", f.get("pic_id"));
} }
Map<String, Object> z = HfMerService.fileUpload(idCard.getImgnegative(), "02", record.getMerchantid()); Map<String, Object> z = HfMerService.fileUpload(idCard.getImgnegative(), "03", record.getMerchantid());
if (ObjectUtil.isNotEmpty(z) && "succeeded".equals(z.get("status"))) { if (ObjectUtil.isNotEmpty(z) && "succeeded".equals(z.get("status"))) {
map.put("legalCertIdBackId", z.get("pic_id")); map.put("legalCertIdBackId", z.get("pic_id"));