| @@ -366,7 +366,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| record.setId(id); | record.setId(id); | ||||
| record.updateTenantInfo(appInfo.getTenantInfo()); | |||||
| record.updateTenantInfo(composeOrder); | |||||
| record.setCUserId(user.getId()); | record.setCUserId(user.getId()); | ||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| @@ -1,11 +1,12 @@ | |||||
| package com.iformall.service.order.entity; | package com.iformall.service.order.entity; | ||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| @Data | @Data | ||||
| public class WxComposeOrder { | |||||
| public class WxComposeOrder extends TenantEntity{ | |||||
| public WxComposeOrder(Long mainOrderId,Integer composeOrderType,Integer payment) { | public WxComposeOrder(Long mainOrderId,Integer composeOrderType,Integer payment) { | ||||
| this.mainOrderId = mainOrderId; | this.mainOrderId = mainOrderId; | ||||
| @@ -47,6 +47,7 @@ public class SingleOrderAdapterService implements OrderAdapterService { | |||||
| public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | ||||
| WxOrder wxOrder = wxOrderMapper.selectById(mainOrderId, tenantId); | WxOrder wxOrder = wxOrderMapper.selectById(mainOrderId, tenantId); | ||||
| WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode(),wxOrder.getPayment()); | WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode(),wxOrder.getPayment()); | ||||
| corder.updateTenantInfo(wxOrder); | |||||
| corder.setSingleOrder(wxOrder); | corder.setSingleOrder(wxOrder); | ||||
| return corder; | return corder; | ||||
| } | } | ||||
| @@ -65,6 +65,7 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic | |||||
| protected WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId,EnumComposeOrder composeOrderType) { | protected WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId,EnumComposeOrder composeOrderType) { | ||||
| WxBatchOrder order = wxBatchOrderMapper.selectById(mainOrderId, tenantId); | WxBatchOrder order = wxBatchOrderMapper.selectById(mainOrderId, tenantId); | ||||
| WxComposeOrder corder = new WxComposeOrder(order.getId(),composeOrderType.getCode(),order.getPayment()); | WxComposeOrder corder = new WxComposeOrder(order.getId(),composeOrderType.getCode(),order.getPayment()); | ||||
| corder.updateTenantInfo(order); | |||||
| corder.setMainOrder(order); | corder.setMainOrder(order); | ||||
| return corder; | return corder; | ||||
| } | } | ||||