Browse Source

fix wx_pay_order分表

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
55405a7c71
5 changed files with 6 additions and 5 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java
  5. +1
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java

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

@@ -527,7 +527,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
if (StringUtils.isBlank(record.getPayOrderNo())) { if (StringUtils.isBlank(record.getPayOrderNo())) {
record.setPayOrderNo(String.valueOf(record.getId())); record.setPayOrderNo(String.valueOf(record.getId()));
} }
WxPayOrder payOrder = wxPayOrderMapper.selectById(record.getId());
WxPayOrder payOrder = wxPayOrderMapper.selectById(record.getId(),record.getTenantId());
if (payOrder != null) { if (payOrder != null) {
record.setPayOrderStatus(payOrder.getPayOrderStatus()); record.setPayOrderStatus(payOrder.getPayOrderStatus());
record.setShare(payOrder.getShare()); record.setShare(payOrder.getShare());


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

@@ -123,7 +123,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
Integer payWay; Integer payWay;
if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()) if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())
||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){ ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){
WxPayOrder wxPayOrder = wxPayOrderMapper.selectById(wxProfitSharingOrder.getOrderId());
WxPayOrder wxPayOrder = wxPayOrderMapper.selectById(wxProfitSharingOrder.getOrderId(),wxProfitSharingOrder.getTenantId());
if (wxPayOrder == null) if (wxPayOrder == null)
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"wxProfitSharingOrder["+wxProfitSharingOrder.getId()+"] 没有payOrder信息."); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"wxProfitSharingOrder["+wxProfitSharingOrder.getId()+"] 没有payOrder信息.");
appinfo = getAppinfo(wxPayOrder.getTenantId(),wxPayOrder.getPayVendor()); appinfo = getAppinfo(wxPayOrder.getTenantId(),wxPayOrder.getPayVendor());


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java View File

@@ -516,7 +516,7 @@ public class WxRefundAdapterService implements RefundPayAdapterService{


String payOrderNo = reqMap.get("out_trade_no"); String payOrderNo = reqMap.get("out_trade_no");
Long payOrderId = Long.valueOf(payOrderNo); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId());
if (payOrder == null) { if (payOrder == null) {
log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
return notifyErrorResult("支付订单不存在"); return notifyErrorResult("支付订单不存在");
@@ -590,7 +590,7 @@ public class WxRefundAdapterService implements RefundPayAdapterService{
return notifySuccessResult(reqMap.get("transaction_id"), reqMap.get("refund_id"), null); return notifySuccessResult(reqMap.get("transaction_id"), reqMap.get("refund_id"), null);
} }
Long payOrderId = Long.valueOf(payOrderNo); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId());
if (payOrder == null) { if (payOrder == null) {
log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
return notifyErrorResult("支付订单不存在"); return notifyErrorResult("支付订单不存在");


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java View File

@@ -285,7 +285,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{
String payOrderNo = paramMap.get("out_trade_no"); String payOrderNo = paramMap.get("out_trade_no");
String timEndStr = paramMap.get("time_end"); String timEndStr = paramMap.get("time_end");
Long payOrderId = Long.valueOf(payOrderNo); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId);
WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId());
if (payOrder == null) { if (payOrder == null) {
log.warn("notify order, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); log.warn("notify order, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
return getErrorResult("订单不存在"); return getErrorResult("订单不存在");


+ 1
- 0
mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java View File

@@ -62,6 +62,7 @@ public class MicropayController extends BaseController {
WxPayOrder q = new WxPayOrder(); WxPayOrder q = new WxPayOrder();
q.setTenantId(tenantId); q.setTenantId(tenantId);
q.setOrderId(order.getId()); q.setOrderId(order.getId());
q.updateTenantInfo(bUser);
List<WxPayOrder> payOrderList = payOrderMapper.selectList(new QueryWrapper<>(q)); List<WxPayOrder> payOrderList = payOrderMapper.selectList(new QueryWrapper<>(q));
if (payOrderList.size() > 0) { if (payOrderList.size() > 0) {
// 查询支付订单状态 // 查询支付订单状态


Loading…
Cancel
Save