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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
韩鹏辉
2024-02-23 17:09:27 +08:00
parent 2b45e77a37 b937c1c0ec
commit 1fa151a881
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
View File

@@ -213,9 +213,9 @@ public class MerchantChannelStatusService {
//D1(已完成) //D1(已完成)
List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1"); List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1");
if (channelD1.size()>1){ // if (channelD1.size()>1){
return new RespBody("000087"); // return new RespBody("000087");
} // }
if (channelD1.size() != 0) { if (channelD1.size() != 0) {
HashMap<String, Object> d1 = new HashMap<>(); HashMap<String, Object> d1 = new HashMap<>();
//审核备注 //审核备注
@@ -226,23 +226,9 @@ public class MerchantChannelStatusService {
d1.put("thirdStatus",channelD1.get(0).getThirdstatus()); d1.put("thirdStatus",channelD1.get(0).getThirdstatus());
//汇付 //汇付
Integer channel = channelD1.get(0).getChannel(); Integer channel = channelD1.get(0).getChannel();
if (channel==7){ d1.put("wxLiteAppId","");
TbPlussMerchantHfInfo findMerchantHfInfo = merchantHfInfoMapper.selectByMerchantCode(tbPlussMerchantBaseInfo.getMerchantcode()); d1.put("wxPubAppId","");
JSONObject jsonObject = JSON.parseObject(findMerchantHfInfo.getWxInfo()); d1.put("wxPubPath","");
if (jsonObject == null){
d1.put("wxLiteAppId","");
d1.put("wxPubAppId","");
d1.put("wxPubPath","");
}else {
d1.put("wxLiteAppId", jsonObject.get("wxLiteAppld"));
d1.put("wxPubAppId", jsonObject.get("wxPubAppld"));
d1.put("wxPubPath", jsonObject.get("wxPubPath"));
}
}else {
d1.put("wxLiteAppId","");
d1.put("wxPubAppId","");
d1.put("wxPubPath","");
}
merchantChannelMessage.add(d1); merchantChannelMessage.add(d1);
} }

2
newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
View File

@@ -633,7 +633,7 @@
tb_pluss_merchant_base_info a tb_pluss_merchant_base_info a
LEFT JOIN tb_pluss_merchant_base_info b ON a.masterMerchantCode = b.merchantCode LEFT JOIN tb_pluss_merchant_base_info b ON a.masterMerchantCode = b.merchantCode
WHERE WHERE
a.masterMerchantCode IS NOT NULL a.masterMerchantCode IS NOT NULL AND a.masterMerchantCode <![CDATA[ <> ]]>''
</select> </select>
</mapper> </mapper>

7
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
View File

@@ -316,11 +316,13 @@ public class YSAuditServiceV3 {
TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(userId); TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(userId);
//如果是小微则用商户简称 //如果是小微则用商户简称
if ("1".equals(merchantBaseInfo.getMerchanttype())) { if ("1".equals(merchantBaseInfo.getMerchanttype())) {
custInfo.setMercName(merchantBaseInfo.getAlias()); custInfo.setMercName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
custInfo.setMercShortName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
}else { }else {
custInfo.setMercName(merchantBaseInfo.getMerchantname()); custInfo.setMercName(merchantBaseInfo.getMerchantname());
custInfo.setMercShortName(merchantBaseInfo.getAlias());
} }
custInfo.setMercShortName(merchantBaseInfo.getAlias());
//对应商户类型 //对应商户类型
switch (merchantBaseInfo.getMerchanttype()) { switch (merchantBaseInfo.getMerchanttype()) {
case MERCH_TYPE_MICRO: case MERCH_TYPE_MICRO:
@@ -761,6 +763,7 @@ public class YSAuditServiceV3 {
try { try {
ReqEntity request = ReqEntity.get(reqMethod); ReqEntity request = ReqEntity.get(reqMethod);
Sign sign = null; Sign sign = null;
log.info("+++++++++++++"+ysConfig.getSrcMerchantNo());
if (channel.equals(4)) { if (channel.equals(4)) {
request.setCertId(ysConfig.getSrcMerchantNo()); request.setCertId(ysConfig.getSrcMerchantNo());
RSA rsa = SecureUtil.rsa(ysConfig.getPriKey(), ysConfig.getOldPubKey()); RSA rsa = SecureUtil.rsa(ysConfig.getPriKey(), ysConfig.getOldPubKey());