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

推广宽图改版，商户列表，注册改版

Browse Source
This commit is contained in:
liuyingfang
2023-08-02 18:19:54 +08:00
parent 9e5aca8d74
commit 0ae6cf60cf
8 changed files with 184 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
List<MerchantProfitVO> teamList = merchantProfitMapper.getMerchantTeamList(typeCode, userId, name, pagerSize, offset);
for (MerchantProfitVO values : teamList) {
List<MerChannelStatusVO> list = new ArrayList<>();
if (values.getMerchantCode() != null) {
if (values.getMerchantCode() == null) {
MerChannelStatusVO V0 = new MerChannelStatusVO();
V0.setStatus("1");
V0.setVirChannelFlag("D1");

1
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
View File

@@ -483,6 +483,7 @@ public class SxfPayServiceImpl implements SxfPayService {
JSONObject reqData = new JSONObject();
reqData.put("ordNo", order.getOrderNumber());
reqData.put("mno", channel.getMerchantId());
log.info("+++++++++++++++++++++++++++++给到随行付的金额为{}",order.getConsumeFee());
reqData.put("amt", order.getConsumeFee());
if ("wechatPay".equalsIgnoreCase(order.getPayTypeCode()) || "sxfPay1".equalsIgnoreCase(order.getPayTypeCode())) {
reqData.put("payType", "WECHAT");