客户修改

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -125,7 +125,7 @@ public class SalesOrder implements Serializable {
 
     private Integer endOrderNO;
 
-    private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉的订单
+    private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉添加的订单
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -600,141 +600,141 @@ public class DmDealerController {
      * @param request
      * @return
      */
-    @ResponseBody
-    @RequestMapping("/order_update")
-    public ResponseJson order_update(HttpServletRequest request) {
-        StringBuffer sbf = new StringBuffer();
-
-        ResponseJson rj = ResponseJson.getSUCCESS();
-        Integer flag = 0;
-
-        SalesOrder salesOrder = new SalesOrder();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(2019,6,01,00,00,00);
-        salesOrder.setStartDate(calendar.getTime());  //startDate
-
-        Calendar endCalendar = Calendar.getInstance();
-        endCalendar.set(2019,7,01,00,00,00);
-        salesOrder.setEndDate(endCalendar.getTime());
-
-        salesOrder.setSalesStatus(1);
-        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
-
-        System.out.println("总共"+salesOrderList.size()+"单");
-        sbf.append("总共"+salesOrderList.size()+"单");
-        int i=0;
-
-        for (SalesOrder so : salesOrderList) {//201909090002
-            System.out.println("当前"+i+"单"+so.getSalesDealCode());
-            sbf.append("当前"+i+"单"+so.getSalesDealCode()+"\n\r");
-            i++;
-            SalesOrder newSo = new SalesOrder();
-
-            if(so.getSalesStatus() != 1){
-                continue;
-            }
-
-            if("KS00000000000001".equals(so.getSalesBatchId())){
-                continue;
-            }
-
-            if(so.getSalesCustomerId() != null){
-                continue;
-            }
-
-            if(so.getSalesPayMoney() == null || so.getSalesPayMoney() == 0 || so.getSalesPayMoney() == 2147483647){
-                Integer price = 0;
-                StoreInfo storeInfo = storeInfoService.getStoreInfoById(so.getSalesStoreId());
-                DealerChannel dealerChannel = new DealerChannel();
-                dealerChannel.setStoreId(so.getSalesStoreId());
-                List<DealerChannel>  dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
-                if(dealerChannelList!= null && dealerChannelList.size() > 0){
-                    dealerChannel = dealerChannelList.get(0);
-                }else{
-                    System.out.println("未查询到客户信息！订单id："+so.getSalesId()+"店铺信息："+storeInfo.getStoreName());
-                    sbf.append("未查询到客户信息！订单id："+so.getSalesId()+"店铺信息："+storeInfo.getStoreName()+"\n\r");
-                    continue;
-                }
-                for (SalesOrderItem salesOrderItem:so.getSalesOrderItemList()) {
-                    SalesOrderItem newSoi = new SalesOrderItem();
-                    newSoi.setItemNum(salesOrderItem.getItemNum());
-                    newSoi.setItemId(salesOrderItem.getItemId());
-
-                    boolean isUpdateItem = false;
-                    if(salesOrderItem.getItemCostTotal() == null ||salesOrderItem.getItemCostTotal() == 0){
-                        SupplierProduct supplierProduct = supplierProductService.getSupplierProductByColorId(salesOrderItem.getItemColorId());
-                        if(supplierProduct != null){
-                            newSoi.setItemCost(supplierProduct.getSpCost());
-                            newSoi.setItemCostTotal(supplierProduct.getSpCost() * newSoi.getItemNum());
-                            isUpdateItem = true;
-                        }else{
-                            System.out.println("未查询到该产品的成本（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）"+ salesOrderItem.getItemColorBar() +"的成本价格订单id："+so.getSalesId());
-                            sbf.append("未查询到该产品的成本（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）的成本价格订单id："+so.getSalesId()+"\n\r");
-                            System.out.println("=============="+sbf+"==============");
-                            return rj;
-                        }
-                    }
-                    if(salesOrderItem.getItemTotal() == null || salesOrderItem.getItemTotal() == 0|| salesOrderItem.getItemTotal() == 2147483647){
-                        DealerProduct dealerProduct = new DealerProduct();
-                        dealerProduct.setDealerId(dealerChannel.getDealerId());
-                        dealerProduct.setColorBar(salesOrderItem.getItemColorBar());
-                        List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
-                        if(dealerProductList.size() > 0){
-                            dealerProduct = dealerProductList.get(0);
-                            if(1 == dealerProduct.getDealProdStoreArea()){
-                                // 1:全部店铺
-                                newSoi.setItemProductDiscount(dealerProduct.getDealProdPrice());
-                                newSoi.setItemProductPrice(dealerProduct.getDealProdPrice());
-                            }else{
-                                // 2:部分店铺
-                                for (DealerProductStore dps:dealerProduct.getDealerProductStoreList()) {
-                                    if(dealerChannel.getDealChannelId().equals(dps.getDealChannelId())){
-                                        newSoi.setItemProductDiscount(dealerProduct.getDealProdPrice());
-                                        newSoi.setItemProductPrice(dealerProduct.getDealProdPrice());
-                                    }
-                                }
-                            }
-                            newSoi.setItemTotal(newSoi.getItemProductDiscount()*newSoi.getItemNum());
-                            isUpdateItem = true;
-                            price += newSoi.getItemTotal();
-                        }else{
-                            System.out.println("=====客户未查询到该产品,店铺名称："+ storeInfo.getStoreName() +"===（"+ salesOrderItem.getItemProductName()+salesOrderItem.getItemProductColor() + "==="+dealerChannel.getDealerId() +"==="+so.getSalesId());
-                            sbf.append("=====客户未查询到该产品,店铺名称："+ storeInfo.getStoreName() +"===（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）的价格订单id："+so.getSalesId()+"==="+ so.getSalesDealCode() +"\n\r");
-                            System.out.println("=============="+sbf+"==============");
-                            return rj;
-                        }
-                    }else{
-                        price += salesOrderItem.getItemTotal();
-                    }
-                    if(isUpdateItem){
-                        flag = salesOrderService.updateOrderItemObj(newSoi);
-                        if(flag < 1){
-                            System.out.println("修改订单项失败！订单id："+so.getSalesId());
-                            return rj;
-                        }
-                    }
-                }
-                newSo.setSalesId(so.getSalesId());  //salesId
-                newSo.setSalesAmount(price);
-                newSo.setSalesPayMoney(price);
-                flag = salesOrderMapper.updateSalesOrder(newSo);
-                if(flag < 1){
-                    System.out.println("修改订单失败！订单id："+so.getSalesId());
-                    return rj;
-                }
-            }
-        }
-
-        sbf.append("完成");
-        System.out.println(sbf.toString());
-        if(flag > 0){
-            rj.setResultMsg("完成");
-            return rj;
-        }else{
-            rj = ResponseJson.getFAILURE();
-            return  rj;
-        }
-    }
+//    @ResponseBody
+//    @RequestMapping("/order_update")
+//    public ResponseJson order_update(HttpServletRequest request) {
+//        StringBuffer sbf = new StringBuffer();
+//
+//        ResponseJson rj = ResponseJson.getSUCCESS();
+//        Integer flag = 0;
+//
+//        SalesOrder salesOrder = new SalesOrder();
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.set(2019,6,01,00,00,00);
+//        salesOrder.setStartDate(calendar.getTime());  //startDate
+//
+//        Calendar endCalendar = Calendar.getInstance();
+//        endCalendar.set(2019,7,01,00,00,00);
+//        salesOrder.setEndDate(endCalendar.getTime());
+//
+//        salesOrder.setSalesStatus(1);
+//        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
+//
+//        System.out.println("总共"+salesOrderList.size()+"单");
+//        sbf.append("总共"+salesOrderList.size()+"单");
+//        int i=0;
+//
+//        for (SalesOrder so : salesOrderList) {//201909090002
+//            System.out.println("当前"+i+"单"+so.getSalesDealCode());
+//            sbf.append("当前"+i+"单"+so.getSalesDealCode()+"\n\r");
+//            i++;
+//            SalesOrder newSo = new SalesOrder();
+//
+//            if(so.getSalesStatus() != 1){
+//                continue;
+//            }
+//
+//            if("KS00000000000001".equals(so.getSalesBatchId())){
+//                continue;
+//            }
+//
+//            if(so.getSalesCustomerId() != null){
+//                continue;
+//            }
+//
+//            if(so.getSalesPayMoney() == null || so.getSalesPayMoney() == 0 || so.getSalesPayMoney() == 2147483647){
+//                Integer price = 0;
+//                StoreInfo storeInfo = storeInfoService.getStoreInfoById(so.getSalesStoreId());
+//                DealerChannel dealerChannel = new DealerChannel();
+//                dealerChannel.setStoreId(so.getSalesStoreId());
+//                List<DealerChannel>  dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
+//                if(dealerChannelList!= null && dealerChannelList.size() > 0){
+//                    dealerChannel = dealerChannelList.get(0);
+//                }else{
+//                    System.out.println("未查询到客户信息！订单id："+so.getSalesId()+"店铺信息："+storeInfo.getStoreName());
+//                    sbf.append("未查询到客户信息！订单id："+so.getSalesId()+"店铺信息："+storeInfo.getStoreName()+"\n\r");
+//                    continue;
+//                }
+//                for (SalesOrderItem salesOrderItem:so.getSalesOrderItemList()) {
+//                    SalesOrderItem newSoi = new SalesOrderItem();
+//                    newSoi.setItemNum(salesOrderItem.getItemNum());
+//                    newSoi.setItemId(salesOrderItem.getItemId());
+//
+//                    boolean isUpdateItem = false;
+//                    if(salesOrderItem.getItemCostTotal() == null ||salesOrderItem.getItemCostTotal() == 0){
+//                        SupplierProduct supplierProduct = supplierProductService.getSupplierProductByColorId(salesOrderItem.getItemColorId());
+//                        if(supplierProduct != null){
+//                            newSoi.setItemCost(supplierProduct.getSpCost());
+//                            newSoi.setItemCostTotal(supplierProduct.getSpCost() * newSoi.getItemNum());
+//                            isUpdateItem = true;
+//                        }else{
+//                            System.out.println("未查询到该产品的成本（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）"+ salesOrderItem.getItemColorBar() +"的成本价格订单id："+so.getSalesId());
+//                            sbf.append("未查询到该产品的成本（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）的成本价格订单id："+so.getSalesId()+"\n\r");
+//                            System.out.println("=============="+sbf+"==============");
+//                            return rj;
+//                        }
+//                    }
+//                    if(salesOrderItem.getItemTotal() == null || salesOrderItem.getItemTotal() == 0|| salesOrderItem.getItemTotal() == 2147483647){
+//                        DealerProduct dealerProduct = new DealerProduct();
+//                        dealerProduct.setDealerId(dealerChannel.getDealerId());
+//                        dealerProduct.setColorBar(salesOrderItem.getItemColorBar());
+//                        List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
+//                        if(dealerProductList.size() > 0){
+//                            dealerProduct = dealerProductList.get(0);
+//                            if(1 == dealerProduct.getDealProdStoreArea()){
+//                                // 1:全部店铺
+//                                newSoi.setItemProductDiscount(dealerProduct.getDealProdPrice());
+//                                newSoi.setItemProductPrice(dealerProduct.getDealProdPrice());
+//                            }else{
+//                                // 2:部分店铺
+//                                for (DealerProductStore dps:dealerProduct.getDealerProductStoreList()) {
+//                                    if(dealerChannel.getDealChannelId().equals(dps.getDealChannelId())){
+//                                        newSoi.setItemProductDiscount(dealerProduct.getDealProdPrice());
+//                                        newSoi.setItemProductPrice(dealerProduct.getDealProdPrice());
+//                                    }
+//                                }
+//                            }
+//                            newSoi.setItemTotal(newSoi.getItemProductDiscount()*newSoi.getItemNum());
+//                            isUpdateItem = true;
+//                            price += newSoi.getItemTotal();
+//                        }else{
+//                            System.out.println("=====客户未查询到该产品,店铺名称："+ storeInfo.getStoreName() +"===（"+ salesOrderItem.getItemProductName()+salesOrderItem.getItemProductColor() + "==="+dealerChannel.getDealerId() +"==="+so.getSalesId());
+//                            sbf.append("=====客户未查询到该产品,店铺名称："+ storeInfo.getStoreName() +"===（"+ salesOrderItem.getItemProductName() +"-"+ salesOrderItem.getItemProductColor() +"）的价格订单id："+so.getSalesId()+"==="+ so.getSalesDealCode() +"\n\r");
+//                            System.out.println("=============="+sbf+"==============");
+//                            return rj;
+//                        }
+//                    }else{
+//                        price += salesOrderItem.getItemTotal();
+//                    }
+//                    if(isUpdateItem){
+//                        flag = salesOrderService.updateOrderItemObj(newSoi);
+//                        if(flag < 1){
+//                            System.out.println("修改订单项失败！订单id："+so.getSalesId());
+//                            return rj;
+//                        }
+//                    }
+//                }
+//                newSo.setSalesId(so.getSalesId());  //salesId
+//                newSo.setSalesAmount(price);
+//                newSo.setSalesPayMoney(price);
+//                flag = salesOrderMapper.updateSalesOrder(newSo);
+//                if(flag < 1){
+//                    System.out.println("修改订单失败！订单id："+so.getSalesId());
+//                    return rj;
+//                }
+//            }
+//        }
+//
+//        sbf.append("完成");
+//        System.out.println(sbf.toString());
+//        if(flag > 0){
+//            rj.setResultMsg("完成");
+//            return rj;
+//        }else{
+//            rj = ResponseJson.getFAILURE();
+//            return  rj;
+//        }
+//    }
 
     /**
      * 下载订单，返回给各个平台

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -249,6 +249,8 @@
                 salesAddressTel : salesAddressTel,
                 colorId : colorId,
                 orderIscostTotal : orderIscostTotal,
+                isCustmerAddOrder : 2,
+                isSelectCustomer : 2,
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,