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

添加汇付支付

This commit is contained in:
韩鹏辉 2024-02-23 17:09:16 +08:00
parent c0cadbe3fe
commit 2b45e77a37
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/OpenNessController.java
View File

@ -153,9 +153,9 @@ public class OpenNessController {
JSONObject object=new JSONObject();
object.put("merchantCode",baseInfo.getMerchantcode());
// for(String key:map.keySet()){
// object.put(key,map.get(key));
// }
for(String key:map.keySet()){
object.put(key,map.get(key));
}
HttpEntity<String> body = new HttpEntity<String>(object.toString(),headers);
ResponseEntity<String> response= restTemplate.postForEntity(apiurl.concat("/order/queryOrder"),body,String.class);
@ -189,7 +189,7 @@ public class OpenNessController {
object.put("contactsName",baseInfo.getContactname());
object.put("contactsPhone",baseInfo.getContactmobile());
object.put("contactsEmail",baseInfo.getEmail());
object.put("mccCode",baseInfo.getMcc());
object.put("mccCode",baseInfo.getMccname());
object.put("provinceCode",baseInfo.getProvinceCode());
object.put("provinceName",baseInfo.getProvince());
object.put("cityCode",baseInfo.getCityCode());

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

@ -1880,6 +1880,8 @@ public class HfMerService {
request.put("accountOpeningPermitId", map.get("accountOpeningPermitId"));//开户许可证图片
Map<String, Object> merchantResident = null;
try {
merchantResident = MerchantResident.auditProfileInfo(request);
@ -2552,14 +2554,14 @@ public class HfMerService {
Map<String, Object> f = HfMerService.fileUpload(idCard.getImgpositive(), "03", record.getMerchantid());
if (ObjectUtil.isNotEmpty(f) && "succeeded".equals(f.get("status"))) {
map.put("legalCertIdBackId", f.get("pic_id"));
map.put("legalCertIdFrontId", f.get("pic_id"));
}
Map<String, Object> z = HfMerService.fileUpload(idCard.getImgnegative(), "02", record.getMerchantid());
if (ObjectUtil.isNotEmpty(z) && "succeeded".equals(z.get("status"))) {
map.put("legalCertIdFrontId", z.get("pic_id"));
map.put("legalCertIdBackId", z.get("pic_id"));
}
Map<String, Object> cz = null;
@ -2579,6 +2581,8 @@ public class HfMerService {
cz = HfMerService.fileUpload(bankCard.getLicenseurl(), "05", record.getMerchantid());
yyzz = HfMerService.fileUpload(image.getPicurl(), "01", record.getMerchantid());
}else {
cz = HfMerService.fileUpload(bankCard.getImgurl(), "05", record.getMerchantid());
}

1
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
View File

@ -1,7 +1,6 @@
package com.chaozhanggui.merchant.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.chaozhanggui.common.system.config.MsgException;
import com.chaozhanggui.dao.system.dao.*;
import com.chaozhanggui.dao.system.entity.*;