客户修改

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerChannelStore.java

@@ -17,6 +17,8 @@ public class DealerChannelStore  implements  Serializable{
     //店铺名称
     private String storeName;
 
+    private Integer noDealerId;
+
     public Integer getDcsId(){
         return dcsId;
     }
@@ -48,4 +50,12 @@ public class DealerChannelStore  implements  Serializable{
     public void setStoreName(String storeName) {
         this.storeName = storeName;
     }
+
+    public Integer getNoDealerId() {
+        return noDealerId;
+    }
+
+    public void setNoDealerId(Integer noDealerId) {
+        this.noDealerId = noDealerId;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/StoreInfoService.java

@@ -49,4 +49,11 @@ public interface StoreInfoService {
      * @return
      */
     Integer addStoreInfo(StoreInfo storeInfo);
+
+    /**
+     * 添加店铺信息 - 没有被客户选中的
+     * @param storeInfo
+     * @return
+     */
+    List<StoreInfo>  getNoSelect(StoreInfo storeInfo,Integer delaerId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/StoreInfoServiceImpl.java

@@ -2,14 +2,18 @@ package com.iamberry.rst.service.cm;
 
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.cm.StoreShip;
+import com.iamberry.rst.core.dm.DealerChannelStore;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.service.cm.mapper.StoreInfoMapper;
 import com.iamberry.rst.service.cm.mapper.StoreShipMapper;
+import com.iamberry.rst.service.dm.mapper.DealerChannelStoreMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Created by liuzhiwei on 2017/11/1.
@@ -21,6 +25,8 @@ public class StoreInfoServiceImpl implements StoreInfoService {
     private StoreInfoMapper storeInfoMapper;
     @Autowired
     private StoreShipMapper storeShipMapper;
+    @Autowired
+    private DealerChannelStoreMapper dealerChannelStoreMapper;
 
     @Override
     public List<StoreInfo> listStore(StoreInfo storeInfo) {
@@ -94,6 +100,32 @@ public class StoreInfoServiceImpl implements StoreInfoService {
         return flag;
     }
 
+    @Override
+    public  List<StoreInfo>  getNoSelect(StoreInfo storeInfo,Integer delaerId) {
+        List<StoreInfo> storeInfoList = storeInfoMapper.listStore(storeInfo);
+
+        DealerChannelStore dealerChannelStore = new DealerChannelStore();
+        dealerChannelStore.setNoDealerId(delaerId);
+        List<DealerChannelStore> dealerChannelStoreList = dealerChannelStoreMapper.getNoDealerChannelStoreList(dealerChannelStore);
+        Iterator<StoreInfo> storeInfoIterator = storeInfoList.iterator();
+        while (storeInfoIterator.hasNext()){
+            StoreInfo si = storeInfoIterator.next();
+            boolean flag = false;
+            for (DealerChannelStore dcs : dealerChannelStoreList) {
+                if(Objects.equals(dcs.getStoreId(),si.getStoreId())){
+                    flag = true;
+                }
+            }
+            if(flag){
+                try{
+                    storeInfoIterator.remove();//使用迭代器的删除方法删除
+                }catch (Exception e){
+                }
+            }
+        }
+        return storeInfoList;
+    }
+
 //    @Override
 //    public List<StoreInfo> listStore(StoreInfo storeInfo) {
 //        return storeInfoMapper.listStore(storeInfo);

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DealerChannelStoreMapper.java

@@ -34,4 +34,11 @@ public interface DealerChannelStoreMapper {
      * @return Integer
      */
     Integer  saveList(List<DealerChannelStore>  dealerChannelStoreList);
+
+    /**
+     * 获取集合
+     * @param  dealerChannelStore
+     * @return List
+     */
+    List<DealerChannelStore> getNoDealerChannelStoreList(DealerChannelStore  dealerChannelStore);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerChannelStoreMapper.xml

@@ -57,4 +57,27 @@
             )
         </foreach >
     </insert>
+
+    <select id="getNoDealerChannelStoreList" resultMap="BaseResultMap" parameterType="DealerChannelStore" >
+        select
+        <include refid="Base_List" />,
+        scs.store_name
+        from tb_rst_dm_dealer_channel_store t
+        LEFT JOIN tb_rst_store_info scs ON t.store_id = scs.store_id
+        LEFT JOIN tb_rst_dm_dealer_channel dc ON t.deal_channel_id = dc.deal_channel_id
+        <where>
+            <if test="dcsId != null ">
+                AND t.dcs_id = #{dcsId}
+            </if >
+            <if test="dealChannelId != null ">
+                AND t.deal_channel_id = #{dealChannelId}
+            </if >
+            <if test="storeId != null ">
+                AND t.store_id = #{storeId}
+            </if >
+            <if test="noDealerId != null ">
+                AND dc.dealer_id  &lt;&gt;  #{noDealerId}
+            </if >
+        </where>
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.controllers.dm;
 
 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.dm.*;
 import com.iamberry.rst.core.order.OrderWarehouse;
@@ -17,6 +18,7 @@ import com.iamberry.rst.faces.dm.*;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.rst.utils.UploadFileUtils;
@@ -78,6 +80,8 @@ public class DmDealerController {
     private SupplierProductService supplierProductService;
     @Autowired
     private PostOrderNumService postOrderNumService;
+    @Autowired
+    private SalesOrderMapper salesOrderMapper;
 
     private static List<LogisticsInfo> LOGISTICSINFO_LIST;
 
@@ -155,12 +159,12 @@ public class DmDealerController {
      */
     @RequiresPermissions(value={"dm:dealer:add","dm:dealer:update"},logical= Logical.OR)
     @RequestMapping("/to_add_dealer_channel")
-    public ModelAndView toAddDealerChannel(HttpServletRequest request,DealerChannel dealerChannel) {
+    public ModelAndView toAddDealerChannel(HttpServletRequest request,DealerChannel dealerChannel,Integer dealerId) {
         ModelAndView mv = new ModelAndView("dm/dealer/add_dealer_channel");
         mv.addObject("dealerChannel",dealerChannel);
         StoreInfo storeInfo = new StoreInfo();
         storeInfo.setStoreStatus(1);
-        List<StoreInfo> storeInfoList = storeInfoService.listStore(storeInfo);
+        List<StoreInfo> storeInfoList = storeInfoService.getNoSelect(storeInfo,dealerId);
         mv.addObject("storeInfoList",storeInfoList);
 
         List<DealerChannelStore> dealerChannelStoreList = new ArrayList<DealerChannelStore>();
@@ -596,127 +600,141 @@ public class DmDealerController {
      * @param request
      * @return
      */
-//    @ResponseBody
-//    @RequestMapping("/order_update")
-//    public ResponseJson order_update(HttpServletRequest request) {
-//        ResponseJson rj = ResponseJson.getSUCCESS();
-//        Integer flag = 0;
-//
-//        SalesOrder salesOrder = new SalesOrder();
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.set(2019,8,01,00,00,00);
-//        salesOrder.setStartDate(calendar.getTime());  //startDate
-//
-//        Calendar endCalendar = Calendar.getInstance();
-//        endCalendar.set(2019,8,10,00,00,00);
-//        salesOrder.setEndDate(endCalendar.getTime());
-//
-//        salesOrder.setSalesStatus(1);
-//        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
-//
-//        System.out.println("总共"+salesOrderList.size()+"单");
-//        int i=0;
-//
-//        for (SalesOrder so : salesOrderList) {//201909090002
-//            System.out.println("当前"+i+"单"+so.getSalesId());
-//            i++;
-//            SalesOrder newSo = new SalesOrder();
-//
-//            if(so.getSalesStatus() != 1){
-//                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());
-//                    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() +"）的成本价格订单id："+so.getSalesId());
-//                        }
-//                    }
-//
-//                    if(salesOrderItem.getItemTotal() == null || salesOrderItem.getItemTotal() == 0|| salesOrderItem.getItemTotal() == 2147483647){
-//                        DealerProduct dealerProduct = new DealerProduct();
-//                        dealerProduct.setDealerId(dealerChannel.getDealerId());
-//                        dealerProduct.setColorBar(salesOrderItem.getItemColorBar());
-//                        System.out.println("========xz==========="+salesOrderItem.getItemColorBar() + "==="+dealerChannel.getDealerId());
-//                        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());
-//                                    }
-//                                }
-//                            }
-//                            System.out.println("========xy==========="+newSoi.getItemProductDiscount() + "===" +  newSoi.getItemNum() +"==="+
-//                                    dealerChannel.getDealerId() + "=====" + salesOrderItem.getItemColorBar());
-//                            newSoi.setItemTotal(newSoi.getItemProductDiscount()*newSoi.getItemNum());
-//
-//                            isUpdateItem = true;
-//                            price += newSoi.getItemTotal();
-//                        }else{
-//                            System.out.println("=======xx========"+salesOrderItem.getItemProductName()+salesOrderItem.getItemProductColor() + "==="+dealerChannel.getDealerId() +"==="+so.getSalesId());
-//                        }
-//                    }else{
-//                        price += salesOrderItem.getItemTotal();
-//                    }
-//                    if(isUpdateItem){
-//                        flag = salesOrderService.updateOrderItemObj(newSoi);
-//                        if(flag < 1){
-//                            System.out.println("修改订单项失败！订单id："+so.getSalesId());
-//                        }
-//                    }
-//                }
-//                newSo.setSalesId(so.getSalesId());  //salesId
-//                newSo.setSalesAmount(price);
-//                newSo.setSalesPayMoney(price);
-//                flag = salesOrderMapper.updateSalesOrder(newSo);
-//                if(flag < 1){
-//                    System.out.println("修改订单失败！订单id："+so.getSalesId());
-//                }
-//            }
-//        }
-//
-//        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/dealer/update_dealer.ftl

@@ -53,7 +53,7 @@
     <div class="pd-20 cl" style="padding-top: 0px;">
         <form action="${path}/admin/dealer/dealere_update" method="post" class="form form-horizontal" id="form-dealer"  onkeydown="if(event.keyCode==13)return false;">
 
-            <input type="hidden" name="dealerId" value="${dmDealer.dealerId!''}">
+            <input type="hidden" name="dealerId" id="dealerId" value="${dmDealer.dealerId!''}">
 
             <div class="row cl">
                 <label class="form-label col-3">

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

@@ -249,7 +249,6 @@
                 salesAddressTel : salesAddressTel,
                 colorId : colorId,
                 orderIscostTotal : orderIscostTotal,
-                orderIscostTotal : 1,
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,

watero-rst-web/src/main/webapp/common/js/dealer/dealer.js

@@ -81,7 +81,8 @@ function addDealerChannnel() {
     CHANNEL_IS_UPDATE = 1;
     CHANNEL_ID_NUM ++;
     var dealChannelIdStr = CHANNEL_ID_PREFIX + CHANNEL_ID_NUM;
-    layer_show_height("添加销售渠道",url_path + "/admin/dealer/to_add_dealer_channel?dealChannelIdStr="+dealChannelIdStr,2);
+    var dealerId = cufte($("#dealerId").val());
+    layer_show_height("添加销售渠道",url_path + "/admin/dealer/to_add_dealer_channel?dealChannelIdStr="+dealChannelIdStr+"&dealerId="+dealerId,2);
 }
 
 function showChannel(channel) {
@@ -129,9 +130,11 @@ function showChannel(channel) {
  * 修改渠道商
  */
 function updateDealerChannel($this) {
+    var dealerId = cufte($("#dealerId").val());
     CHANNEL_IS_UPDATE =2;
     var $contact = $this.parents("tr");
     var channel = new Object();
+    channel.dealerId = dealerId;
     channel.dealChannelId = $contact.find(".dealChannelId").val();
     channel.dealChannelIdStr = $contact.find(".dealChannelIdStr").val();
     channel.dealChannelName= $contact.find(".dealChannelName").text();