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

进件更改部分

This commit is contained in:
liuyingfang 2024-02-23 16:05:52 +08:00
parent c0cadbe3fe
commit b937c1c0ec
3 changed files with 12 additions and 23 deletions
Show Stats 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(已完成)
List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1");
if (channelD1.size()>1){
return new RespBody("000087");
}
// if (channelD1.size()>1){
// return new RespBody("000087");
// }
if (channelD1.size() != 0) {
HashMap<String, Object> d1 = new HashMap<>();
//审核备注
@ -226,23 +226,9 @@ public class MerchantChannelStatusService {
d1.put("thirdStatus",channelD1.get(0).getThirdstatus());
//汇付
Integer channel = channelD1.get(0).getChannel();
if (channel==7){
TbPlussMerchantHfInfo findMerchantHfInfo = merchantHfInfoMapper.selectByMerchantCode(tbPlussMerchantBaseInfo.getMerchantcode());
JSONObject jsonObject = JSON.parseObject(findMerchantHfInfo.getWxInfo());
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","");
}
d1.put("wxLiteAppId","");
d1.put("wxPubAppId","");
d1.put("wxPubPath","");
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
LEFT JOIN tb_pluss_merchant_base_info b ON a.masterMerchantCode = b.merchantCode
WHERE
a.masterMerchantCode IS NOT NULL
a.masterMerchantCode IS NOT NULL AND a.masterMerchantCode <![CDATA[ <> ]]>''
</select>
</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);
//如果是小微则用商户简称
if ("1".equals(merchantBaseInfo.getMerchanttype())) {
custInfo.setMercName(merchantBaseInfo.getAlias());
custInfo.setMercName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
custInfo.setMercShortName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
}else {
custInfo.setMercName(merchantBaseInfo.getMerchantname());
custInfo.setMercShortName(merchantBaseInfo.getAlias());
}
custInfo.setMercShortName(merchantBaseInfo.getAlias());
//对应商户类型
switch (merchantBaseInfo.getMerchanttype()) {
case MERCH_TYPE_MICRO:
@ -761,6 +763,7 @@ public class YSAuditServiceV3 {
try {
ReqEntity request = ReqEntity.get(reqMethod);
Sign sign = null;
log.info("+++++++++++++"+ysConfig.getSrcMerchantNo());
if (channel.equals(4)) {
request.setCertId(ysConfig.getSrcMerchantNo());
RSA rsa = SecureUtil.rsa(ysConfig.getPriKey(), ysConfig.getOldPubKey());