|
|
@@ -4,6 +4,8 @@ import com.uas.api.b2c_erp.buyer.model.B2cOrder;
|
|
|
import com.uas.api.b2c_erp.buyer.model.B2cOrderDetail;
|
|
|
import com.uas.api.b2c_erp.buyer.model.Payment;
|
|
|
import com.uas.api.b2c_erp.buyer.service.B2cOrderService;
|
|
|
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
|
|
|
+import com.uas.platform.b2c.common.account.model.Enterprise;
|
|
|
import com.uas.platform.b2c.core.config.SysConf;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.FastjsonUtils;
|
|
|
@@ -66,6 +68,9 @@ public class B2cOrderServiceImpl implements B2cOrderService {
|
|
|
@Autowired
|
|
|
private BankInfoService bankInfoService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private EnterpriseDao enterpriseDao;
|
|
|
+
|
|
|
@Override
|
|
|
public List<B2cOrder> getAllOrder() {
|
|
|
// 要获取的采购的状态
|
|
|
@@ -111,6 +116,11 @@ public class B2cOrderServiceImpl implements B2cOrderService {
|
|
|
}
|
|
|
if (productExists) {
|
|
|
B2cOrder b2cOrder = ModelConverter.convert(order);
|
|
|
+ // 设置卖方企业信息
|
|
|
+ Enterprise sellerEnter= enterpriseDao.findByUu(b2cOrder.getSellerenuu());
|
|
|
+ if (sellerEnter != null) {
|
|
|
+ b2cOrder.setSellerEnter(com.uas.platform.b2c.external.erp.common.util.ModelConverter.convert(sellerEnter));
|
|
|
+ }
|
|
|
b2cOrder.setOrderDetails(b2cOrderDetails);
|
|
|
b2cOrders.add(b2cOrder);
|
|
|
}
|