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

Merge branch 'master' of https://gitee.com/shaanxi-super-shopkeeper_1/newadmin

Browse Source
This commit is contained in:
19991905653
2024-02-29 09:04:02 +08:00
parent 1beb292d28 5646ba5a5c
commit 307aaf50eb
3 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
newadmin/admin/admin.jar
View File

Binary file not shown.

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

@@ -2079,31 +2079,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" +
@@ -2323,31 +2323,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" +
@@ -2386,30 +2386,40 @@ public class HfMerService {
} }
TbPlussMerchantHfInfo hfInfo = new TbPlussMerchantHfInfo(); TbPlussMerchantHfInfo hfInfo= tbPlussMerchantHfInfoMapper.selectByMerchantCode(baseInfo.getMerchantcode());
JSONObject object=new JSONObject(); if(ObjectUtil.isEmpty(hfInfo)||hfInfo==null){
if(ObjectUtil.isNotNull(wxLiteAppId)&&ObjectUtil.isNotEmpty(wxLiteAppId)){ hfInfo = new TbPlussMerchantHfInfo();
JSONObject wxlite=new JSONObject(); JSONObject object=new JSONObject();
wxlite.put("appid",wxLiteAppId); if(ObjectUtil.isNotNull(wxLiteAppId)&&ObjectUtil.isNotEmpty(wxLiteAppId)){
object.put("wx_lite",wxlite); JSONObject wxlite=new JSONObject();
} wxlite.put("appid",wxLiteAppId);
object.put("wx_lite",wxlite);
}
if(ObjectUtil.isNotNull(wxPubAppId)&&ObjectUtil.isNotEmpty(wxPubAppId) if(ObjectUtil.isNotNull(wxPubAppId)&&ObjectUtil.isNotEmpty(wxPubAppId)
&&ObjectUtil.isNotNull(wxPubPath)&&ObjectUtil.isNotEmpty(wxPubPath) &&ObjectUtil.isNotNull(wxPubPath)&&ObjectUtil.isNotEmpty(wxPubPath)
){ ){
JSONObject wxpub=new JSONObject(); JSONObject wxpub=new JSONObject();
wxpub.put("appid",wxPubAppId); wxpub.put("appid",wxPubAppId);
wxpub.put("path",wxPubPath); wxpub.put("path",wxPubPath);
object.put("wx_pub",wxpub); object.put("wx_pub",wxpub);
} }
hfInfo.setMerchantCode(baseInfo.getMerchantcode()); hfInfo.setMerchantCode(baseInfo.getMerchantcode());
hfInfo.setStatus("0"); hfInfo.setStatus("0");
hfInfo.setPrivKey(privateKey); hfInfo.setPrivKey(privateKey);
hfInfo.setPucKey(publicKey); hfInfo.setPucKey(publicKey);
hfInfo.setWxInfo(object.toJSONString()); hfInfo.setWxInfo(ObjectUtil.isEmpty(object)?null:object.toJSONString());
hfInfo.setCreateTime(new Date()); hfInfo.setCreateTime(new Date());
tbPlussMerchantHfInfoMapper.insert(hfInfo); tbPlussMerchantHfInfoMapper.insert(hfInfo);
}else {
hfInfo.setStatus("0");
hfInfo.setPrivKey(privateKey);
hfInfo.setPucKey(publicKey);
hfInfo.setCreateTime(new Date());
tbPlussMerchantHfInfoMapper.updateByPrimaryKeySelective(hfInfo);
}
TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord(); TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord();
merchantAuditRecord.setStatus("1"); merchantAuditRecord.setStatus("1");
@@ -2627,14 +2637,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"));
@@ -2738,6 +2748,7 @@ public class HfMerService {
String baseUrl = it; String baseUrl = it;
StringBuilder sb = new StringBuilder(baseUrl); StringBuilder sb = new StringBuilder(baseUrl);
sb.append("?title=").append(merchantBaseInfo.getAlias()); sb.append("?title=").append(merchantBaseInfo.getAlias());
sb.append("?type=").append("1");
sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&password=").append(userInfo.getPassword().toLowerCase());
sb.append("&mcc=").append(merchantBaseInfo.getMcc()); sb.append("&mcc=").append(merchantBaseInfo.getMcc());
sb.append("&mccName=").append(merchantBaseInfo.getMccname()); sb.append("&mccName=").append(merchantBaseInfo.getMccname());

6
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java
View File

@@ -107,9 +107,9 @@ public class LklAuditService {
object1.put("merType", (baseInfo.getMerchanttype().equals(1) || baseInfo.getMerchanttype().equals("2")) ? "TP_PERSONAL" : "TP_MERCHANT"); //商户注册类型 TP_MERCHANT:企业 TP_PERSONAL:⼩微个⼈ object1.put("merType", (baseInfo.getMerchanttype().equals(1) || baseInfo.getMerchanttype().equals("2")) ? "TP_PERSONAL" : "TP_MERCHANT"); //商户注册类型 TP_MERCHANT:企业 TP_PERSONAL:⼩微个⼈
object1.put("merName", baseInfo.getAlias()); //商户名称(经营名称) 不能少于七个中文 object1.put("merName", baseInfo.getAlias()); //商户名称(经营名称) 不能少于七个中文
object1.put("merAddr", baseInfo.getAddress()); //去掉省，市区后的详细地址 object1.put("merAddr", baseInfo.getAddress()); //去掉省，市区后的详细地址
object1.put("provinceCode", tbPlussRegionLklMapper.selectByName(baseInfo.getProvince())); //省代码 通过【地区信息→获取地区查询】接口获取 对应 code字段 object1.put("provinceCode", tbPlussRegionLklMapper.selectByName(baseInfo.getProvince()).getCode()); //省代码 通过【地区信息→获取地区查询】接口获取 对应 code字段
object1.put("cityCode", tbPlussRegionLklMapper.selectByName(baseInfo.getCity())); // 市代码 通过【地区信息→获取地区查询】接口获取 对应 code字段 object1.put("cityCode", tbPlussRegionLklMapper.selectByName(baseInfo.getCity()).getCode()); // 市代码 通过【地区信息→获取地区查询】接口获取 对应 code字段
object1.put("countyCode",tbPlussRegionLklMapper.selectByName(baseInfo.getDistrict())); // 区县代码 通过【地区信息→获取地区查询】接口获取 对应 code字段 object1.put("countyCode",tbPlussRegionLklMapper.selectByName(baseInfo.getDistrict()).getCode()); // 区县代码 通过【地区信息→获取地区查询】接口获取 对应 code字段