From df0091e0e11d51ebb80a53cdeac60038dc8fdea9 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 26 Sep 2021 11:17:44 +0800 Subject: [PATCH] fix order --- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 2 +- .../java/com/iformall/service/order/entity/WxComposeOrder.java | 3 ++- .../iformall/service/order/impl/SingleOrderAdapterService.java | 1 + .../service/order/impl/batch/BaseBatchOrderAdapterService.java | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index c99418095..b914658da 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -366,7 +366,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } record.setId(id); - record.updateTenantInfo(appInfo.getTenantInfo()); + record.updateTenantInfo(composeOrder); record.setCUserId(user.getId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java index 1d3389dee..2ef5c7753 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java @@ -1,11 +1,12 @@ package com.iformall.service.order.entity; import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @Data -public class WxComposeOrder { +public class WxComposeOrder extends TenantEntity{ public WxComposeOrder(Long mainOrderId,Integer composeOrderType,Integer payment) { this.mainOrderId = mainOrderId; diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java index b9c67c996..8ab3dfcb9 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java @@ -47,6 +47,7 @@ public class SingleOrderAdapterService implements OrderAdapterService { public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { WxOrder wxOrder = wxOrderMapper.selectById(mainOrderId, tenantId); WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode(),wxOrder.getPayment()); + corder.updateTenantInfo(wxOrder); corder.setSingleOrder(wxOrder); return corder; } diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java index b18e387c6..243df9164 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java @@ -65,6 +65,7 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic protected WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId,EnumComposeOrder composeOrderType) { WxBatchOrder order = wxBatchOrderMapper.selectById(mainOrderId, tenantId); WxComposeOrder corder = new WxComposeOrder(order.getId(),composeOrderType.getCode(),order.getPayment()); + corder.updateTenantInfo(order); corder.setMainOrder(order); return corder; }