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

修改开户回调

This commit is contained in:
zhujunshuai 2023-03-16 18:10:14 +08:00
parent 6ef533af5a
commit c10814f3da
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
View File

@ -119,6 +119,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
/** /**
* 计算分润开始 * 计算分润开始
* @date: 2022/1/21 15:29 * @date: 2022/1/21 15:29
*
* @param userApp: * @param userApp:
* @param orderType: * @param orderType:
*/ */

3
pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
View File

@ -408,6 +408,9 @@ public class ApiPayServiceImpl implements ApiPayService {
result.put("mercOrderNo",order.getMercOrderNo()); result.put("mercOrderNo",order.getMercOrderNo());
result.put("orderNumber",order.getOrderNumber()); result.put("orderNumber",order.getOrderNumber());
result.put("payAmt",order.getConsumeFee().toString()); result.put("payAmt",order.getConsumeFee().toString());
System.out.println("下单测试");
return ResultGenerator.genSuccessJsonResult("下单成功", result); return ResultGenerator.genSuccessJsonResult("下单成功", result);
} }
if (channel.getChannel() == 1) { if (channel.getChannel() == 1) {

2
pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
View File

@ -120,7 +120,7 @@ public abstract class BaseMerAuditHandler<T extends IMerAuditHandler> implements
QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>() QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
.eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06"); .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper); MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; String baseUrl = "https://ky.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
StringBuffer sb = new StringBuffer(baseUrl); StringBuffer sb = new StringBuffer(baseUrl);
sb.append("&title=").append(merchantBaseInfo.getAlias()); sb.append("&title=").append(merchantBaseInfo.getAlias());
sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&password=").append(userInfo.getPassword().toLowerCase());

2
pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
View File

@ -350,7 +350,7 @@ public class SxfMerAuditHandler {
QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>() QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
.eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06"); .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper); MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; String baseUrl = "https://ky.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
StringBuilder sb = new StringBuilder(baseUrl); StringBuilder sb = new StringBuilder(baseUrl);
sb.append("&title=").append(merchantBaseInfo.getAlias()); sb.append("&title=").append(merchantBaseInfo.getAlias());
sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&password=").append(userInfo.getPassword().toLowerCase());