|
|
@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
|
|
|
import com.uas.platform.b2b.dao.DeputyOrderDao;
|
|
|
import com.uas.platform.b2b.dao.DeputyOrderItemDao;
|
|
|
import com.uas.platform.b2b.dao.VendorDao;
|
|
|
+import com.uas.platform.b2b.mobile.dao.DeputyEnterpriseDao;
|
|
|
import com.uas.platform.b2b.model.DeputyOrder;
|
|
|
import com.uas.platform.b2b.model.DeputyOrderItem;
|
|
|
import com.uas.platform.b2b.model.Vendor;
|
|
|
@@ -39,6 +40,9 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
|
|
|
@Autowired
|
|
|
private VendorDao vendorDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private DeputyEnterpriseDao deputyEnterpriseDao;
|
|
|
+
|
|
|
@Override
|
|
|
public ModelMap releaseByWorkbook(Workbook workbook) {
|
|
|
ModelMap modelMap = new ModelMap();
|
|
|
@@ -169,7 +173,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
|
|
|
order.setVenduseruu(deorder.getVenduseruu());
|
|
|
order.setEnuu(SystemSession.getUser().getEnterprise().getUu());
|
|
|
order.setEntrystatus(deorder.getEntrystatus());
|
|
|
- order.setDeputyuu(Long.valueOf(10041166));// TODO 以后需要添加其他中间商
|
|
|
+ order.setDeputyuu(Long.valueOf(deputyEnterpriseDao.findAll().get(0).getDeputyenuu()));// TODO
|
|
|
order.setRate(vendorRate());
|
|
|
order.setCurrency(deorder.getCurrency());
|
|
|
int i = 1;
|
|
|
@@ -235,7 +239,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
|
|
|
@Override
|
|
|
public Double vendorRate() {
|
|
|
List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
- Long.valueOf(10041166));
|
|
|
+ Long.valueOf(deputyEnterpriseDao.findAll().get(0).getDeputyenuu()));
|
|
|
Double rate = 0.00;
|
|
|
if (!CollectionUtils.isEmpty(vendors)) {
|
|
|
rate = vendors.get(0).getRate();
|
hejq