|
|
@@ -3,6 +3,7 @@ package com.iamberry.rst.controllers.order;
|
|
|
import com.iamberry.rst.controllers.sys.SysController;
|
|
|
import com.iamberry.rst.core.cm.SalesOrder;
|
|
|
import com.iamberry.rst.core.cm.SalesOrderItem;
|
|
|
+import com.iamberry.rst.core.cm.StoreInfo;
|
|
|
import com.iamberry.rst.core.order.*;
|
|
|
import com.iamberry.rst.core.page.PageRequest;
|
|
|
import com.iamberry.rst.core.page.PagedResult;
|
|
|
@@ -13,6 +14,7 @@ import com.iamberry.rst.core.sys.Admin;
|
|
|
import com.iamberry.rst.core.sys.OrderCheckStatus;
|
|
|
import com.iamberry.rst.core.sys.Relu;
|
|
|
import com.iamberry.rst.faces.cm.SalesOrderService;
|
|
|
+import com.iamberry.rst.faces.cm.StoreInfoService;
|
|
|
import com.iamberry.rst.faces.order.EfastOrderService;
|
|
|
import com.iamberry.rst.faces.order.OrderService;
|
|
|
import com.iamberry.rst.faces.product.ProductService;
|
|
|
@@ -23,6 +25,7 @@ import com.iamberry.rst.utils.AdminUtils;
|
|
|
import com.iamberry.rst.utils.ExcelUtil;
|
|
|
import com.iamberry.rst.utils.OrderNoUtil;
|
|
|
import com.iamberry.wechat.tools.DateTimeUtil;
|
|
|
+import com.iamberry.wechat.tools.NameUtils;
|
|
|
import com.iamberry.wechat.tools.ObjectExcelView;
|
|
|
import com.iamberry.wechat.tools.ResponseJson;
|
|
|
import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
|
|
|
@@ -76,6 +79,8 @@ public class AdminOrderController {
|
|
|
//Efast升级 2018-6-8
|
|
|
@Autowired
|
|
|
private SalesOrderService salesOrderService;
|
|
|
+ @Autowired
|
|
|
+ private StoreInfoService storeInfoService;
|
|
|
|
|
|
/**
|
|
|
* 进入更换滤芯页面
|
|
|
@@ -946,48 +951,163 @@ public class AdminOrderController {
|
|
|
//Efast升级 2018-6-8
|
|
|
boolean bl = false;
|
|
|
List<SalesOrder> salesOrderList = null;//new ArrayList<SalesOrder>();
|
|
|
- List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
- List<String> salesOrderIdList = null;
|
|
|
+ List<SalesOrderItem> salesOrderItemList = null;//new ArrayList<SalesOrderItem>();
|
|
|
+ List<String> salesOrderIdList = null;//new ArrayList<String>();
|
|
|
+ List<ProductColor> listColor = null;
|
|
|
SalesOrder salesOrder = null;
|
|
|
SalesOrderItem salesOrderItem = null;
|
|
|
+ ProductColor productColor = null;
|
|
|
+ Product product = null;
|
|
|
+ Integer salesAmount = 0;
|
|
|
+ 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){
|
|
|
- if(salesOrderIdList !=null && salesOrderIdList.size()>0){
|
|
|
- String salesOrderId = efastOrder.getOrderId();
|
|
|
- if(salesOrderIdList.contains(salesOrderId)){
|
|
|
- salesOrderItemList = SalesOrder.getSalesOrderItemList();
|
|
|
- salesOrderItem = new SalesOrderItem();
|
|
|
- salesOrderItem.setItemOrderId(Integer.valueOf(salesOrderId));
|
|
|
- if(salesOrderItemList !=null && salesOrderItemList.size()>0){
|
|
|
- salesOrderItemList.add(salesOrderItem);
|
|
|
- }else{
|
|
|
- salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
+ 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();
|
|
|
}
|
|
|
- }else{
|
|
|
- salesOrderIdList.add(salesOrderId);
|
|
|
- salesOrder = new SalesOrder();
|
|
|
- salesOrderItem = new SalesOrderItem();
|
|
|
- salesOrder.setSalesOrderId(efastOrder.getOrderId());
|
|
|
- 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.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();
|
|
|
- salesOrder.setSalesOrderId(efastOrder.getOrderId());
|
|
|
+ //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();
|
|
|
+ }
|
|
|
+ /*salesOrder.setSalesOrderId(orderId);
|
|
|
salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
|
|
|
salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
|
|
|
salesOrder.setSalesOpenId(efastOrder.getOrderOpenId());
|
|
|
@@ -995,11 +1115,56 @@ public class AdminOrderController {
|
|
|
salesOrder.setItemNum(efastOrder.getOrderNum());
|
|
|
salesOrder.setItemProductName(efastOrder.getOrderProductName());
|
|
|
salesOrder.setSalesSendType(Integer.valueOf(efastOrder.getOrderPostType()));
|
|
|
- salesOrder.setStoreEfast(efastOrder.getOrderStoreId());
|
|
|
+ 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);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if(salesOrderList != null && salesOrderList.size() > 0){
|
|
|
+ for(SalesOrder SalesOrder: salesOrderList){
|
|
|
+ bl = salesOrderService.addRstOrderAndIteminfo(salesOrder);
|
|
|
+ logger.info("EFAST升级合并订单项调用boolean值+："+bl);
|
|
|
+ return new ResponseJson(200, "SUCCESS", 200)
|
|
|
+ .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
|
|
|
+ .addResponseKeyValue("order_list", salesOrderList);
|
|
|
+ }
|
|
|
+ }
|
|
|
//
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
for (int i = 0; i < orderEfasts.size(); i++) {
|
