xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时订单加入多品类支持

dev
wuwenxiong 2021-09-15 16:22:43 +08:00
parent b03dbc62cd
commit 2f8c9df763
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java
View File

@ -57,12 +57,13 @@ public class OrderclusterController extends BaseController {
String customer_texpayer_name = get("customer_texpayer_name"); String customer_texpayer_name = get("customer_texpayer_name");
Integer req_receipt = getInt("req_receipt"); Integer req_receipt = getInt("req_receipt");
double total_weight = getParaToDouble("total_weight"); double total_weight = getParaToDouble("total_weight");
Date start_time = getDate("start_time"); Date start_time = getDate("start_time");
Date cutoff_time = getDate("cutoff_time"); Date cutoff_time = getDate("cutoff_time");
int supermarket_id = getInt("supermarket_id"); int supermarket_id = getInt("supermarket_id");
String trucks = get("trucks"); String trucks = get("trucks");
Integer product_id = getInt("product_id");
renderJson(OrderclusterSyncService.me.saveTemp(customer_name, customer_texpayer_name, customer_texpayer_num, req_receipt, total_weight, start_time, cutoff_time, supermarket_id, trucks, tokenuser)); renderJson(OrderclusterSyncService.me.saveTemp(customer_name, customer_texpayer_name, customer_texpayer_num, req_receipt, total_weight, start_time, cutoff_time, supermarket_id, trucks, product_id, tokenuser));
} }
/** /**

7
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
View File

@ -248,6 +248,7 @@ public class OrderclusterSyncService extends BaseSyncService {
Date cutoff_time, Date cutoff_time,
int supermarket_id, int supermarket_id,
String trucks, String trucks,
Integer product_id,
Sysuser sysuser Sysuser sysuser
) { ) {
String query_start_time = DateTimeUtil.sdf.get().format(start_time); String query_start_time = DateTimeUtil.sdf.get().format(start_time);
@ -267,12 +268,12 @@ public class OrderclusterSyncService extends BaseSyncService {
return Result.failedstr("客户[%s][%s]至[%s]在砂站[%s]还有未完成的配额", customer_name, query_start_time, query_cutoff_time, SvrCacheData.SUP_CACHE.get(supermarket_id).getName()); return Result.failedstr("客户[%s][%s]至[%s]在砂站[%s]还有未完成的配额", customer_name, query_start_time, query_cutoff_time, SvrCacheData.SUP_CACHE.get(supermarket_id).getName());
} }
Product product = Product.dao.findById(Const.DEFAULT_PRODUCT_ID); Product product = Product.dao.findById(product_id);
if (product == null) { if (product == null) {
return Result.failedstr("商品信息配置错误"); return Result.failedstr("商品信息配置错误");
} }
BigDecimal unitprice = SupermarketProductService.me.getUnitPrice(supermarket_id, product.getId()); BigDecimal unitprice = SupermarketProductService.me.getUnitPrice(supermarket_id, product_id);
if (unitprice == null) { if (unitprice == null) {
return Result.failed("未配置商品单价"); return Result.failed("未配置商品单价");
} }
@ -359,7 +360,7 @@ public class OrderclusterSyncService extends BaseSyncService {
model.setTimeInterval(1); model.setTimeInterval(1);
model.setMiniTruck(1); model.setMiniTruck(1);
model.setProductId(product.getId()); model.setProductId(product_id);
model.setProductName(product.getName()); model.setProductName(product.getName());
model.setUnitPrice(unitprice); // 后端获取数据库中单价 model.setUnitPrice(unitprice); // 后端获取数据库中单价