Browse Source

update login user

release_toaliyun_real
xhxu 4 years ago
parent
commit
9e2e1d6848
4 changed files with 5 additions and 0 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  3. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java View File

@@ -45,6 +45,7 @@ public class WxPayOrderController extends BaseController {
public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxPayOrderController::list");
if (null == wxPayOrder) wxPayOrder = new WxPayOrder();
wxPayOrder.updateTenantInfo(getTenantInfo());
final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java View File

@@ -492,6 +492,7 @@ public class WxMicroPayController extends BaseController {

WxPayOrder qpo = new WxPayOrder();
qpo.setOrderId(microOrder.getId());
qpo.updateTenantInfo(getTenantInfo());
WxPayOrder po = wxPayOrderService.getByObj(qpo);
if (null == po) {
return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND);


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -275,6 +275,7 @@ public class WxPayOrderController extends BaseController {
if (null == wxPayOrder) {
wxPayOrder = new WxPayOrder();
}
wxPayOrder.updateTenantInfo(getTenantInfo());
final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize);
return new ResultData(page);
}


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

@@ -328,6 +328,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
//一个订单只有一条支付记录。
WxPayOrder orderq = new WxPayOrder();
orderq.setOrderId(composeOrder.getMainOrderId());
orderq.updateTenantInfo(composeOrder);
List<WxPayOrder> list = wxPayOrderMapper.findList(orderq);
WxPayOrder oldRecord = null;
if (null != list && list.size() > 0) {
@@ -473,6 +474,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
// 2. check 是否有支付订单
Date currentDate = new Date();
WxPayOrder pq = new WxPayOrder();
pq.updateTenantInfo(order);
pq.setOrderId(EnumComposeOrder.getPayOrderId(order));
List<WxPayOrder> list = wxPayOrderMapper.findList(pq);
String payOrderNo = "";


Loading…
Cancel
Save