Browse Source

//shar

release_toaliyun_real
xhxu 3 years ago
parent
commit
7c8d792b3a
2 changed files with 8 additions and 5 deletions
  1. +7
    -5
      mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 7
- 5
mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java View File

@@ -3,6 +3,7 @@ package com.iformall.service.helper;
import java.util.Date;
import java.util.Map;

import com.iformall.enums.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,10 +17,6 @@ import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.WxPayAccount;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumOrderStatus;
import com.iformall.enums.EnumPayEndFrom;
import com.iformall.enums.EnumPayMode;
import com.iformall.enums.EnumPayStatus;
import com.iformall.exception.MallinkException;
import com.iformall.pay.WxPay;
import com.iformall.pay.WxPayOrderQ;
@@ -168,7 +165,12 @@ public class WxPayOrderServiceHelper {
payOrderSQ.setAppid(appInfo.getParentAppId());
payOrderSQ.setSub_appid(appInfo.getAppId());
payOrderSQ.setMch_id(payAccount.getMchId());
payOrderSQ.setSub_mch_id(payAccount.getSubMchId());
if (payAccount.getMchType() == EnumPayMchType.TOTAL.getCode()) {
payOrderSQ.setSub_mch_id(payAccount.getSubMchId());
}else if (payAccount.getMchType() == EnumPayMchType.DIRECT.getCode()) {
payOrderSQ.setSub_mch_id(record.getSingleChildOrderShare().getMerchantUid());
}
// payOrderSQ.setSub_mch_id(payAccount.getSubMchId());
payOrderSQ.setNonce_str(noncestr);
if (StringUtils.isNotBlank(record.getTransactionId())) {
payOrderSQ.setTransaction_id(record.getTransactionId());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -2722,6 +2722,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
childShares.put(String.valueOf(composeOrder.getSingleOrder().getId()), new WxComposeChildOrderShare(composeOrder.getSingleOrder().getId(),payAmount,merchant_id,merchant_uid));

payOrder.setChildOrderShare(JSON.toJSONString(childShares));
payOrder.setPayFrom(EnumPayFrom.INSIDE_B.getCode());
payOrder.setPosPayOrderId(couponOrder.getId());



Loading…
Cancel
Save