|
|
@@ -952,7 +952,6 @@ public class AdminOrderController {
|
|
|
boolean bl = false;
|
|
|
List<SalesOrder> salesOrderList = null;//new ArrayList<SalesOrder>();
|
|
|
List<SalesOrderItem> salesOrderItemList = null;//new ArrayList<SalesOrderItem>();
|
|
|
- List<String> salesOrderIdList = null;//new ArrayList<String>();
|
|
|
List<ProductColor> listColor = null;
|
|
|
SalesOrder salesOrder = null;
|
|
|
SalesOrderItem salesOrderItem = null;
|
|
|
@@ -962,210 +961,113 @@ public class AdminOrderController {
|
|
|
String sd_id = NameUtils.getConfig("sd_id");//商店ID(店铺id)
|
|
|
Date date = new Date();
|
|
|
StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(sd_id);
|
|
|
- if(orderEfasts != null && orderEfasts.size()>0){
|
|
|
- for (EfastOrder efastOrder: orderEfasts) {
|
|
|
- String orderId = efastOrder.getOrderId();
|
|
|
- String orderProductBarCode = efastOrder.getOrderProductBarCode();
|
|
|
- if(salesOrderList != null && salesOrderList.size()>0){
|
|
|
- for(SalesOrder SalesOrder: salesOrderList){
|
|
|
- String salesOrderId = SalesOrder.getSalesOrderId();
|
|
|
- salesOrderIdList = new ArrayList<String>();
|
|
|
- salesOrderIdList.add(salesOrderId);
|
|
|
- if(salesOrderIdList.contains(orderId)){
|
|
|
- salesOrderItemList = SalesOrder.getSalesOrderItemList();
|
|
|
- if(StringUtil.isNotEmpty(orderProductBarCode)){
|
|
|
- productColor = new ProductColor();
|
|
|
- productColor.setColorBar(orderProductBarCode);
|
|
|
- listColor = productService.listproductAndColor(productColor);
|
|
|
- if(listColor != null && listColor.size() > 0){
|
|
|
- productColor = listColor.get(0);
|
|
|
- product = productService.getProductById(listColor.get(0).getColorId());
|
|
|
- salesOrderItem = new SalesOrderItem();
|
|
|
- //salesOrderItem.setItemOrderId(Integer.parseInt(orderId));
|
|
|
- //salesOrderItem.setItemColorBar(orderProductBarCode);
|
|
|
- //salesOrderItemList.add(salesOrderItem);
|
|
|
- //addOrder
|
|
|
- salesOrderItem.setItemColorId(productColor.getColorId());
|
|
|
- if(product != null){
|
|
|
- salesOrderItem.setItemProductId(product.getProductId());
|
|
|
- salesOrderItem.setItemProductType(product.getProductType());
|
|
|
- }
|
|
|
- /*salesOrderItem.setItemProductName(product.getProductName());*/
|
|
|
- salesOrderItem.setItemProductPic(productColor.getColorPicture());
|
|
|
- salesOrderItem.setItemProductColor(productColor.getColorName());
|
|
|
- salesOrderItem.setItemColorBar(productColor.getColorBar());
|
|
|
- salesOrderItem.setItemProductPrice(productColor.getColorPrice());
|
|
|
- salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
|
|
|
- salesOrderItem.setItemIsSource(1);
|
|
|
- salesOrderItemList.add(salesOrderItem);
|
|
|
- salesAmount += productColor.getColorDiscount();
|
|
|
- }
|
|
|
- SalesOrder.setSalesOrderItemList(salesOrderItemList);
|
|
|
- salesOrderList.add(salesOrder);
|
|
|
- }
|
|
|
- }else{
|
|
|
- //begin
|
|
|
- salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
- salesOrder = new SalesOrder();
|
|
|
- salesOrderItem = new SalesOrderItem();
|
|
|
- //String orderId = efastOrder.getOrderId();
|
|
|
- //String orderProductBarCode = efastOrder.getOrderProductBarCode();
|
|
|
- if(StringUtil.isNotEmpty(orderProductBarCode)){
|
|
|
- productColor = new ProductColor();
|
|
|
- productColor.setColorBar(orderProductBarCode);
|
|
|
- listColor = productService.listproductAndColor(productColor);
|
|
|
- if(listColor != null && listColor.size() > 0){
|
|
|
- productColor = listColor.get(0);
|
|
|
- product = productService.getProductById(listColor.get(0).getColorId());
|
|
|
- //salesOrderItem.setItemOrderId(Integer.parseInt(orderId));
|
|
|
- salesOrderItem.setItemColorId(productColor.getColorId());
|
|
|
- if(product != null){
|
|
|
- salesOrderItem.setItemProductId(product.getProductId());
|
|
|
- salesOrderItem.setItemProductType(product.getProductType());
|
|
|
- }
|
|
|
- /*salesOrderItem.setItemProductName(product.getProductName());*/
|
|
|
- salesOrderItem.setItemProductPic(productColor.getColorPicture());
|
|
|
- salesOrderItem.setItemProductColor(productColor.getColorName());
|
|
|
- salesOrderItem.setItemColorBar(productColor.getColorBar());
|
|
|
- salesOrderItem.setItemProductPrice(productColor.getColorPrice());
|
|
|
- salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
|
|
|
- salesOrderItem.setItemIsSource(1);
|
|
|
- salesOrderItemList.add(salesOrderItem);
|
|
|
- salesAmount += productColor.getColorDiscount();
|
|
|
- }
|
|
|
- }
|
|
|
- salesOrder.setSalesOpenId("0");
|
|
|
- salesOrder.setSalesDiscountMoney(salesAmount);
|
|
|
- salesOrder.setSalesPledgeMoney(salesAmount);
|
|
|
- salesOrder.setSalesRemainDeposit(salesAmount);
|
|
|
- salesOrder.setSalesStatus(1);
|
|
|
- salesOrder.setSalesSendType(2);
|
|
|
- salesOrder.setSalesSalesTime(date);
|
|
|
- //salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
|
|
|
- salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
|
|
|
- salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
|
|
|
- salesOrder.setSalesAddressName(efastOrder.getOrderAddress());
|
|
|
- salesOrder.setSalesAmount(efastOrder.getOrderAmount());
|
|
|
- salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
|
|
|
- salesOrder.setSalesPayType(1);
|
|
|
- salesOrder.setSalesWaitMoney(efastOrder.getOrderAmount() - efastOrder.getOrderPayMoney());
|
|
|
- //salesOrder.setSalesWaitMoney(money_paid);
|
|
|
- salesOrder.setSalesShippingFee(0);//??????????
|
|
|
- salesOrder.setSalesPayTime(date);
|
|
|
- salesOrder.setSalesLastMoney(efastOrder.getOrderPayMoney());
|
|
|
- salesOrder.setSalesCreateTime(new Date());
|
|
|
- salesOrder.setSalesAdminRemark(efastOrder.getOrderBuyerRemark());
|
|
|
- salesOrder.setSalesUserRemark(efastOrder.getOrderSellerRemark());
|
|
|
- salesOrder.setSalesStoreId(storeInfo.getStoreId());
|
|
|
- salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
|
|
|
- salesOrder.setSalesType(1);
|
|
|
- salesOrder.setSalesDealCode(efastOrder.getOrderDealCode());
|
|
|
- salesOrder.setSalesOrderStatus(1);
|
|
|
- salesOrder.setSalesShippingStatus(0);
|
|
|
- salesOrder.setSalesPayStatus(2);
|
|
|
- salesOrder.setSalesProcessStatus(0);
|
|
|
- salesOrder.setSalesIsSend(0);
|
|
|
- salesOrder.setSalesIsLocked(0);
|
|
|
- salesOrder.setSalesIsSeparate(0);
|
|
|
- salesOrder.setSalesIsDownload(1);
|
|
|
- salesOrder.setSalesOrderItemList(salesOrderItemList);
|
|
|
- salesOrderList.add(salesOrder);
|
|
|
- // end
|
|
|
- }
|
|
|
- }
|
|
|
- }else{
|
|
|
- salesOrderList = new ArrayList<SalesOrder>();
|
|
|
- salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
- salesOrder = new SalesOrder();
|
|
|
- salesOrderItem = new SalesOrderItem();
|
|
|
- //String orderId = efastOrder.getOrderId();
|
|
|
- //String orderProductBarCode = efastOrder.getOrderProductBarCode();
|
|
|
- if(StringUtil.isNotEmpty(orderProductBarCode)){
|
|
|
- productColor = new ProductColor();
|
|
|
- productColor.setColorBar(orderProductBarCode);
|
|
|
- listColor = productService.listproductAndColor(productColor);
|
|
|
- if(listColor != null && listColor.size() > 0){
|
|
|
- productColor = listColor.get(0);
|
|
|
- product = productService.getProductById(listColor.get(0).getColorId());
|
|
|
- //salesOrderItem.setItemOrderId(Integer.parseInt(orderId));
|
|
|
- //salesOrderItem.setItemColorBar(orderProductBarCode);
|
|
|
- //salesOrderItemList.add(salesOrderItem);
|
|
|
- //addOrder
|
|
|
- salesOrderItem.setItemColorId(productColor.getColorId());
|
|
|
- if (product != null){
|
|
|
- salesOrderItem.setItemProductId(product.getProductId());
|
|
|
- salesOrderItem.setItemProductType(product.getProductType());
|
|
|
- }
|
|
|
- /*salesOrderItem.setItemProductName(product.getProductName());*/
|
|
|
- salesOrderItem.setItemProductPic(productColor.getColorPicture());
|
|
|
- salesOrderItem.setItemProductColor(productColor.getColorName());
|
|
|
- salesOrderItem.setItemColorBar(productColor.getColorBar());
|
|
|
- salesOrderItem.setItemProductPrice(productColor.getColorPrice());
|
|
|
- salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
|
|
|
- salesOrderItem.setItemIsSource(1);
|
|
|
- }
|
|
|
- salesOrderItemList.add(salesOrderItem);
|
|
|
- salesAmount += productColor.getColorDiscount();
|
|
|
+ Map<String,SalesOrder> mapsalesOrderList = new HashMap<>();
|
|
|
+ if(orderEfasts == null || orderEfasts.size() <= 0) {
|
|
|
+ return ResponseJson.SUCCESS;
|
|
|
+ }
|
|
|
+ for (EfastOrder efastOrder: orderEfasts) {
|
|
|
+ String orderId = efastOrder.getOrderId();
|
|
|
+ SalesOrder order = mapsalesOrderList.get(orderId);
|
|
|
+ if (order == null) {
|
|
|
+ // 没有订单
|
|
|
+ salesOrderList = new ArrayList<SalesOrder>();
|
|
|
+ salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
+ salesOrder = new SalesOrder();
|
|
|
+ salesOrderItem = new SalesOrderItem();
|
|
|
+ if (StringUtil.isEmpty(efastOrder.getOrderProductBarCode())) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ productColor = new ProductColor();
|
|
|
+ productColor.setColorBar(efastOrder.getOrderProductBarCode());
|
|
|
+ listColor = productService.listproductAndColor(productColor);
|
|
|
+ if (listColor != null && listColor.size() > 0) {
|
|
|
+ productColor = listColor.get(0);
|
|
|
+ product = productService.getProductById(listColor.get(0).getColorId());
|
|
|
+ //salesOrderItem.setItemOrderId(Integer.parseInt(orderId));
|
|
|
+ //salesOrderItem.setItemColorBar(orderProductBarCode);
|
|
|
+ //salesOrderItemList.add(salesOrderItem);
|
|
|
+ //addOrder
|
|
|
+ salesOrderItem.setItemColorId(productColor.getColorId());
|
|
|
+ if (product != null) {
|
|
|
+ salesOrderItem.setItemProductId(product.getProductId());
|
|
|
+ salesOrderItem.setItemProductType(product.getProductType());
|
|
|
}
|
|
|
- /*salesOrder.setSalesOrderId(orderId);
|
|
|
- salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
|
|
|
- salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
|
|
|
- salesOrder.setSalesOpenId(efastOrder.getOrderOpenId());
|
|
|
- salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
|
|
|
- salesOrder.setItemNum(efastOrder.getOrderNum());
|
|
|
- salesOrder.setItemProductName(efastOrder.getOrderProductName());
|
|
|
- salesOrder.setSalesSendType(Integer.valueOf(efastOrder.getOrderPostType()));
|
|
|
- salesOrder.setStoreEfast(efastOrder.getOrderStoreId());*/
|
|
|
- salesOrder.setSalesOpenId("0");
|
|
|
- salesOrder.setSalesDiscountMoney(salesAmount);
|
|
|
- salesOrder.setSalesPledgeMoney(salesAmount);
|
|
|
- salesOrder.setSalesRemainDeposit(salesAmount);
|
|
|
- salesOrder.setSalesStatus(1);
|
|
|
- salesOrder.setSalesSendType(2);
|
|
|
- salesOrder.setSalesSalesTime(date);
|
|
|
- //salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
|
|
|
- salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
|
|
|
- salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
|
|
|
- salesOrder.setSalesAddressName(efastOrder.getOrderAddress());
|
|
|
- salesOrder.setSalesAmount(efastOrder.getOrderAmount());
|
|
|
- salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
|
|
|
- salesOrder.setSalesPayType(1);
|
|
|
- salesOrder.setSalesWaitMoney(efastOrder.getOrderAmount() - efastOrder.getOrderPayMoney());
|
|
|
- //salesOrder.setSalesWaitMoney(money_paid);
|
|
|
- salesOrder.setSalesShippingFee(0);//??????????
|
|
|
- salesOrder.setSalesPayTime(date);
|
|
|
- salesOrder.setSalesLastMoney(efastOrder.getOrderPayMoney());
|
|
|
- salesOrder.setSalesCreateTime(new Date());
|
|
|
- salesOrder.setSalesAdminRemark(efastOrder.getOrderBuyerRemark());
|
|
|
- salesOrder.setSalesUserRemark(efastOrder.getOrderSellerRemark());
|
|
|
- salesOrder.setSalesStoreId(storeInfo.getStoreId());
|
|
|
- salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
|
|
|
- salesOrder.setSalesType(1);
|
|
|
- salesOrder.setSalesDealCode(efastOrder.getOrderDealCode());
|
|
|
- salesOrder.setSalesOrderStatus(1);
|
|
|
- salesOrder.setSalesShippingStatus(0);
|
|
|
- salesOrder.setSalesPayStatus(2);
|
|
|
- salesOrder.setSalesProcessStatus(0);
|
|
|
- salesOrder.setSalesIsSend(0);
|
|
|
- salesOrder.setSalesIsLocked(0);
|
|
|
- salesOrder.setSalesIsSeparate(0);
|
|
|
- salesOrder.setSalesIsDownload(1);
|
|
|
- salesOrder.setSalesOrderItemList(salesOrderItemList);
|
|
|
- salesOrderList.add(salesOrder);
|
|
|
- }
|
|
|
+ /*salesOrderItem.setItemProductName(product.getProductName());*/
|
|
|
+ salesOrderItem.setItemProductPic(productColor.getColorPicture());
|
|
|
+ salesOrderItem.setItemProductColor(productColor.getColorName());
|
|
|
+ salesOrderItem.setItemColorBar(productColor.getColorBar());
|
|
|
+ salesOrderItem.setItemProductPrice(productColor.getColorPrice());
|
|
|
+ salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
|
|
|
+ salesOrderItem.setItemIsSource(1);
|
|
|
+ }
|
|
|
+ salesOrderItemList.add(salesOrderItem);
|
|
|
+ salesAmount += productColor.getColorDiscount();
|
|
|
+
|
|
|
+ salesOrder.setSalesOpenId("0");
|
|
|
+ salesOrder.setSalesDiscountMoney(salesAmount);
|
|
|
+ salesOrder.setSalesPledgeMoney(salesAmount);
|
|
|
+ salesOrder.setSalesRemainDeposit(salesAmount);
|
|
|
+ salesOrder.setSalesStatus(1);
|
|
|
+ salesOrder.setSalesSendType(2);
|
|
|
+ salesOrder.setSalesSalesTime(date);
|
|
|
+ //salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
|
|
|
+ salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
|
|
|
+ salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
|
|
|
+ salesOrder.setSalesAddressName(efastOrder.getOrderAddress());
|
|
|
+ salesOrder.setSalesAmount(efastOrder.getOrderAmount());
|
|
|
+ salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
|
|
|
+ salesOrder.setSalesPayType(1);
|
|
|
+ salesOrder.setSalesWaitMoney(efastOrder.getOrderAmount() - efastOrder.getOrderPayMoney());
|
|
|
+ //salesOrder.setSalesWaitMoney(money_paid);
|
|
|
+ salesOrder.setSalesShippingFee(0);//??????????
|
|
|
+ salesOrder.setSalesPayTime(date);
|
|
|
+ salesOrder.setSalesLastMoney(efastOrder.getOrderPayMoney());
|
|
|
+ salesOrder.setSalesCreateTime(new Date());
|
|
|
+ salesOrder.setSalesAdminRemark(efastOrder.getOrderBuyerRemark());
|
|
|
+ salesOrder.setSalesUserRemark(efastOrder.getOrderSellerRemark());
|
|
|
+ salesOrder.setSalesStoreId(storeInfo.getStoreId());
|
|
|
+ salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
|
|
|
+ salesOrder.setSalesType(1);
|
|
|
+ salesOrder.setSalesDealCode(efastOrder.getOrderDealCode());
|
|
|
+ salesOrder.setSalesOrderStatus(1);
|
|
|
+ salesOrder.setSalesShippingStatus(0);
|
|
|
+ salesOrder.setSalesPayStatus(2);
|
|
|
+ salesOrder.setSalesProcessStatus(0);
|
|
|
+ salesOrder.setSalesIsSend(0);
|
|
|
+ salesOrder.setSalesIsLocked(0);
|
|
|
+ salesOrder.setSalesIsSeparate(0);
|
|
|
+ salesOrder.setSalesIsDownload(1);
|
|
|
+ salesOrder.setSalesOrderItemList(salesOrderItemList);
|
|
|
+ salesOrderList.add(salesOrder);
|
|
|
+ mapsalesOrderList.put(orderId, salesOrder);
|
|
|
+ } else {
|
|
|
+ // 有订单，合并到原有订单的订单项
|
|
|
+ salesOrderItem = new SalesOrderItem();
|
|
|
+ salesOrderItem.setItemColorId(productColor.getColorId());
|
|
|
+ if (product != null) {
|
|
|
+ salesOrderItem.setItemProductId(product.getProductId());
|
|
|
+ salesOrderItem.setItemProductType(product.getProductType());
|
|
|
+ }
|
|
|
+ salesOrderItem.setItemProductPic(productColor.getColorPicture());
|
|
|
+ salesOrderItem.setItemProductColor(productColor.getColorName());
|
|
|
+ salesOrderItem.setItemColorBar(productColor.getColorBar());
|
|
|
+ salesOrderItem.setItemProductPrice(productColor.getColorPrice());
|
|
|
+ salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
|
|
|
+ salesOrderItem.setItemIsSource(1);
|
|
|
+ order.getSalesOrderItemList().add(salesOrderItem);
|
|
|
+ mapsalesOrderList.put(orderId, salesOrder);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(salesOrderList != null && salesOrderList.size() > 0){
|
|
|
- for(SalesOrder SalesOrder: salesOrderList){
|
|
|
- bl = salesOrderService.addRstOrderAndIteminfo(salesOrder);
|
|
|
+ for(SalesOrder SalesOrder: mapsalesOrderList.values()){
|
|
|
+ bl = salesOrderService.addRstOrderAndIteminfo(SalesOrder);
|
|
|
logger.info("EFAST升级合并订单项调用boolean值+："+bl);
|
|
|
return new ResponseJson(200, "SUCCESS", 200)
|
|
|
.addResponseKeyValue("errorPath", request.getContextPath() + filePath)
|
|
|
.addResponseKeyValue("order_list", salesOrderList);
|
|
|
- }
|
|
|
- }
|
|
|
- //
|
|
|
+ }
|
|
|
+ //Efast升级 2018-6-8
|
|
|
+
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
for (int i = 0; i < orderEfasts.size(); i++) {
|
|
|
//Efast升级只取交易号 2018-6-8
|
