客户系统修改

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

@@ -30,6 +30,10 @@ public class DealerChannel  implements  Serializable{
     private String channelTypeName;
     //店铺名称
     private String storeName;
+    //客户名称
+    private String dealerName;
+    //是否自营 1:自营 2:非自营
+    private Integer dealerSelfOperated;
     //
     private String dealChannelIdStr;
 
@@ -120,4 +124,20 @@ public class DealerChannel  implements  Serializable{
     public void setDealChannelIdStr(String dealChannelIdStr) {
         this.dealChannelIdStr = dealChannelIdStr;
     }
+
+    public String getDealerName() {
+        return dealerName;
+    }
+
+    public void setDealerName(String dealerName) {
+        this.dealerName = dealerName;
+    }
+
+    public Integer getDealerSelfOperated() {
+        return dealerSelfOperated;
+    }
+
+    public void setDealerSelfOperated(Integer dealerSelfOperated) {
+        this.dealerSelfOperated = dealerSelfOperated;
+    }
 }

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

@@ -34,6 +34,8 @@ public class DealerProduct  implements  Serializable{
 
     //
     private String dealProdIdStr;
+    //颜色sku
+    private String colorBar;
 
     //客户产品关联店铺id拼接值
     private String dealerProductStoreIds;
@@ -145,4 +147,12 @@ public class DealerProduct  implements  Serializable{
     public void setDealerProductStoreName(String dealerProductStoreName) {
         this.dealerProductStoreName = dealerProductStoreName;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

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

@@ -22,8 +22,11 @@
         <include refid="Base_List" />,
         si.store_name,
         dc.channel_name,
-        dct.channel_type_name
+        dct.channel_type_name,
+        dd.dealer_name,
+        dd.dealer_self_operated
         from tb_rst_dm_dealer_channel t
+        LEFT JOIN tb_rst_dm_dealer dd ON  t.dealer_id = dd.dealer_id
         LEFT JOIN tb_rst_store_info si ON  t.store_id = si.store_id
         LEFT JOIN tb_rst_dm_channel dc ON  t.channel_id = dc.channel_id
         LEFT JOIN tb_rst_dm_channel_type dct ON  dc.channel_type_id = dct.channel_type_id

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

@@ -50,8 +50,10 @@
     </resultMap>
     <select id="getDealerProductAndStoreList" resultMap="DealerProductMap" parameterType="DealerProduct" >
         select
-        <include refid="Base_List" />
+        <include refid="Base_List" />,
+        pc.color_bar
         from tb_rst_dm_dealer_product t
+        LEFT JOIN tb_rst_product_color pc ON t.color_id = pc.color_id
         <where>
             <if test="dealProdId != null ">
                 AND t.deal_prod_id = #{dealProdId}
@@ -68,6 +70,12 @@
             <if test="dealProdStoreArea != null ">
                 AND t.deal_prod_store_area = #{dealProdStoreArea}
             </if >
+            <if test="dealProdStoreArea != null ">
+                AND t.deal_prod_store_area = #{dealProdStoreArea}
+            </if >
+            <if test="colorBar != null and colorBar != ''">
+                AND pc.color_bar  = #{colorBar}
+            </if >
         </where>
     </select>
     <select id="getDealerProductStoreList" resultType="DealerProductStore" parameterType="DealerProductStore" >

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

@@ -2,8 +2,9 @@ package com.iamberry.rst.controllers.dm;
 
 import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
-import com.iamberry.rst.core.cm.SalesOrderItem;
-import com.iamberry.rst.core.dm.*;
+import com.iamberry.rst.core.dm.ClaimOrder;
+import com.iamberry.rst.core.dm.DmDealer;
+import com.iamberry.rst.core.dm.FinancialReceipt;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -365,46 +366,46 @@ public class FinanciaReceController {
             salesOrder.setSalesIds(salesIds);
         }
         List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
-        DmDealer dmDealer = dmDealerService.getDmDealerById(dealerId);
-
-        // 是否自营 1:自营 2:非自营
-        if(dmDealer.getDealerSelfOperated() == 2){
-            DealerChannel  dealerChannel = new DealerChannel();
-            dealerChannel.setDealerId(dealerId);
-            List<DealerChannel> dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
-
-            DealerProduct dealerProduct = new DealerProduct();
-            dealerProduct.setDealerId(dealerId);
-            List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
-
-            for (SalesOrder so : salesOrderList) {
-                for (SalesOrderItem salesOrderItem:so.getSalesOrderItemList()) {
-                    salesOrderItem.setItemTotal(0);
-                    for (DealerProduct dp:dealerProductList) {
-                        if(Objects.equals(salesOrderItem.getItemColorId(), dp.getColorId())){
-                            if(dp.getDealProdStoreArea() == 1){
-                                //店铺范围 1:全部店铺
-                                for (DealerChannel dc:dealerChannelList) {
-                                    if(Objects.equals(dc.getStoreId(), so.getSalesStoreId())){
-                                        salesOrderItem.setItemTotal(salesOrderItem.getItemNum() * dp.getDealProdPrice());
-                                        break;
-                                    }
-                                }
-                            }else if (dp.getDealProdStoreArea() == 2){
-                                //2:部分店铺
-                                for (DealerProductStore dps:dp.getDealerProductStoreList()) {
-                                    if(Objects.equals(so.getSalesStoreId(), dps.getStoreId())){
-                                        salesOrderItem.setItemTotal(salesOrderItem.getItemNum() * dp.getDealProdPrice());
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-        }
+
+//        DmDealer dmDealer = dmDealerService.getDmDealerById(dealerId);
+//        // 是否自营 1:自营 2:非自营
+//        if(dmDealer.getDealerSelfOperated() == 2){
+//            DealerChannel  dealerChannel = new DealerChannel();
+//            dealerChannel.setDealerId(dealerId);
+//            List<DealerChannel> dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
+//
+//            DealerProduct dealerProduct = new DealerProduct();
+//            dealerProduct.setDealerId(dealerId);
+//            List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
+//
+//            for (SalesOrder so : salesOrderList) {
+//                for (SalesOrderItem salesOrderItem:so.getSalesOrderItemList()) {
+//                    salesOrderItem.setItemTotal(0);
+//                    for (DealerProduct dp:dealerProductList) {
+//                        if(Objects.equals(salesOrderItem.getItemColorId(), dp.getColorId())){
+//                            if(dp.getDealProdStoreArea() == 1){
+//                                //店铺范围 1:全部店铺
+//                                for (DealerChannel dc:dealerChannelList) {
+//                                    if(Objects.equals(dc.getStoreId(), so.getSalesStoreId())){
+//                                        salesOrderItem.setItemTotal(salesOrderItem.getItemNum() * dp.getDealProdPrice());
+//                                        break;
+//                                    }
+//                                }
+//                            }else if (dp.getDealProdStoreArea() == 2){
+//                                //2:部分店铺
+//                                for (DealerProductStore dps:dp.getDealerProductStoreList()) {
+//                                    if(Objects.equals(so.getSalesStoreId(), dps.getStoreId())){
+//                                        salesOrderItem.setItemTotal(salesOrderItem.getItemNum() * dp.getDealProdPrice());
+//                                        break;
+//                                    }
+//                                }
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
+//            }
+//        }
         ResponseJson rj = new ResponseJson(200, "查询成功", 200);
         rj.addResponseKeyValue("salesOrderList", salesOrderList);
         return rj;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -994,7 +994,6 @@ public class AdminOrderController {
                                        @RequestParam("isOtherStore") Integer isOtherStore,
                                        @RequestParam("storeArray[]") String[] storeArray,
                                        @RequestParam("orderBatch") String orderBatch,
-                                       @RequestParam("selfOperated") Integer selfOperated,
                                        HttpServletRequest request) throws Exception {
         logger.info("-----------根据excel内容推送到百胜开始,Excel路径："+ filePath +"-----------");
 
@@ -1010,7 +1009,7 @@ public class AdminOrderController {
         }
         // 读取文件中内容
         List<EfastOrder> orderEfasts = excelUtil.readCell(request.getServletContext().getRealPath(filePath),
-                productName, maps, infos, tel, name,platformOrder, num,discount,remark, priceMap, postType,orderStoreInfoSt,isOtherStore, storeArray,selfOperated);
+                productName, maps, infos, tel, name,platformOrder, num,discount,remark, priceMap, postType,orderStoreInfoSt,isOtherStore, storeArray);
         logger.info("---------orderEfasts订单个数为："+orderEfasts.size() + "------------");
 
         //Efast升级 2018-6-8

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1,6 +1,9 @@
 package com.iamberry.rst.controllers.order;
 
-import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.cm.CompanyInfo;
+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.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -8,6 +11,7 @@ import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.CompanyInfoService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.rst.faces.dm.DealerChannelService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.order.OrderBatchService;
@@ -70,6 +74,8 @@ public class AdminSalesOrderController {
     private SmsService smsService;
     @Autowired
     private OrderWarehouseService orderWarehouseService;
+    @Autowired
+    private DealerChannelService dealerChannelService;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -1932,4 +1938,90 @@ public class AdminSalesOrderController {
         rj.addResponseKeyValue("pagedResult", pagedResult);
         return rj;
     }
+
+    @ResponseBody
+    @RequestMapping("/get_product")
+    public ResponseJson getProduct(HttpServletRequest request, ProductColor productColor,Integer storeId) throws Exception {
+        ResponseJson rj =  new ResponseJson(200, "SUCCESS", 200);
+        productColor.setColorStatus(1);
+        List<ProductColor> productColorList = productService.listproductAndColor(productColor);
+
+//        DealerChannel dealerChannel = new DealerChannel();
+//        boolean flag = true;
+//        if(storeId != null){
+//            dealerChannel.setStoreId(storeId);
+//            List<DealerChannel>  dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
+//            if(dealerChannelList!= null && dealerChannelList.size() > 0){
+//                dealerChannel = dealerChannelList.get(0);
+//            }else{
+//                order.setReturnStatus("error");
+//                order.setReturnMsg("订单导入失败-查询店铺对应客户信息失败，店铺ID："+order.getStoreId()+"。");
+//                order.setPlatformOrderId("1");
+//                flag = false;
+//            }
+//
+//            if(flag){
+//                if(1 == dealerChannel.getDealerSelfOperated()){
+//                    //是否自营 1:自营 2:非自营
+//                    String colorDiscount = "-1";
+//                    colorDiscount = getValue(temp.getCell(discountColumnIndex)).trim();
+//                    if(colorDiscount != null && !"".equals(colorDiscount)){
+//                        colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n","");
+//                    }
+//                    if(colorDiscount == null || "".equals(colorDiscount)){
+//                        order.setReturnStatus("error");
+//                        order.setReturnMsg("价格不正确"+"。");
+//                        order.setPlatformOrderId("1");
+//                    }else{
+//                        // 计算单个价格
+//                        Double colorDiscountDou = Double.valueOf(colorDiscount);
+//                        colorDiscountDou = colorDiscountDou*100/orderNumByInt;
+//                        order.setOrderProductDiscount(colorDiscountDou.intValue());
+//                        order.setOrderProductPrice(colorDiscountDou.intValue());
+//                        //赋值小结
+//                        Double orderTotal = Double.valueOf(colorDiscount);
+//                        orderTotal = orderTotal*100;
+//                        order.setOrderTotal(orderTotal.intValue());
+//                    }
+//                }else{
+//                    //2:非自营
+//                    DealerProduct dealerProduct = new DealerProduct();
+//                    dealerProduct.setDealerId(dealerChannel.getDealerId());
+//                    dealerProduct.setColorBar(OrderProductBarCodeValue);
+//                    List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
+//                    if(dealerProductList != null && dealerProductList.size() > 0){
+//                        for (DealerProduct dp:dealerProductList) {
+//                            if(1 == dp.getDealProdStoreArea()){
+//                                // 1:全部店铺
+//                                order.setOrderProductDiscount(dp.getDealProdPrice());
+//                                order.setOrderProductPrice(dp.getDealProdPrice());
+//                                order.setOrderTotal(dp.getDealProdPrice()*orderNumByInt);
+//                            }else{
+//                                // 2:部分店铺
+//                                for (DealerProductStore dps:dp.getDealerProductStoreList()) {
+//                                    if(order.getStoreId().equals(dps.getStoreId())){
+//                                        order.setOrderProductDiscount(dp.getDealProdPrice());
+//                                        order.setOrderProductPrice(dp.getDealProdPrice());
+//                                        order.setOrderTotal(dp.getDealProdPrice()*orderNumByInt);
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }else{
+//                        order.setReturnStatus("error");
+//                        order.setReturnMsg("订单导入-未能从该客户中获取到对应产品的信息，客户名称："+dealerChannel.getDealerName()+",产品SKU："+ OrderProductBarCodeValue+"。");
+//                        order.setPlatformOrderId("1");
+//                    }
+//                }
+//            }
+//
+//        }
+//
+//        for (:
+//             ) {
+//
+//        }
+        rj.addResponseKeyValue("productColorList",productColorList);
+        return rj;
+    }
 }

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -1,9 +1,14 @@
 package com.iamberry.rst.utils;
 
+import com.iamberry.rst.core.dm.DealerChannel;
+import com.iamberry.rst.core.dm.DealerProduct;
+import com.iamberry.rst.core.dm.DealerProductStore;
 import com.iamberry.rst.core.order.EfastOrder;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.pts.PtsBomComponents;
 import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.dm.DealerChannelService;
+import com.iamberry.rst.faces.dm.DealerProductService;
 import com.iamberry.wechat.tools.AddrUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -36,6 +41,10 @@ public class ExcelUtil {
 
     @Autowired
     private SalesOrderService salesOrderService;
+    @Autowired
+    private DealerChannelService dealerChannelService;
+    @Autowired
+    private DealerProductService dealerProductService;
 
     /**
      * 读取Excel文件头
@@ -374,7 +383,7 @@ public class ExcelUtil {
 
     public List<EfastOrder> readCell(String filePath, String productName, String[] maps,
                                             String[] infos, String tel, String name,String platformOrder, String num, String discount,String remark,
-                                            Map<String, ProductColor> price, String postType, String orderStoreInfoSt, Integer isOtherStore,String[] storeArray,Integer selfOperated)
+                                            Map<String, ProductColor> price, String postType, String orderStoreInfoSt, Integer isOtherStore,String[] storeArray)
             throws IOException {
         Map<String, String> map = new HashMap<>();
         for (String t : maps) {
@@ -552,34 +561,6 @@ public class ExcelUtil {
                 }
                 order.setOrderRemark(orderRemark);
 
-                String colorDiscount = "0";
-                if(selfOperated == 1){
-                    colorDiscount = getValue(temp.getCell(discountColumnIndex)).trim();
-                    if(colorDiscount != null && !"".equals(colorDiscount)){
-                        colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n","");
-                    }
-                    if(colorDiscount == null || "".equals(colorDiscount)){
-                        order.setReturnStatus("error");
-                        order.setReturnMsg("价格不正确");
-                        // 读取购买数量
-                        order.setOrderProductDiscount(0);
-                        order.setOrderProductPrice(0);
-                    }else{
-                        // 读取购买数量
-                        Double colorDiscountDou = Double.valueOf(colorDiscount);
-                        colorDiscountDou = colorDiscountDou*100/orderNumByInt;
-                        order.setOrderProductDiscount(colorDiscountDou.intValue());
-                        order.setOrderProductPrice(colorDiscountDou.intValue());
-                        Double orderTotal = Double.valueOf(colorDiscount);
-                        orderTotal = orderTotal*100;
-                        order.setOrderTotal(orderTotal.intValue());
-                    }
-                }else{
-                    order.setOrderProductDiscount(0);
-                    order.setOrderProductPrice(0);
-                    order.setOrderTotal(0);
-                }
-
                 try{
                     if (infoColumnIndex.length == 1){
                         // 如果infoColumnIndex = 1, 则表示需要截取（可能是-、“ ”）
@@ -646,6 +627,92 @@ public class ExcelUtil {
                     //店铺
                     order.setStoreId(Integer.valueOf(storeArray[0]));
                 }
+
+                //-- 获取价格 --
+                order.setOrderProductDiscount(-1);
+                order.setOrderProductPrice(-1);
+                order.setOrderTotal(-1);
+                DealerChannel dealerChannel = new DealerChannel();
+                boolean flag = true;
+                if(order.getStoreId() != null){
+                    dealerChannel.setStoreId(order.getStoreId());
+                    List<DealerChannel>  dealerChannelList = dealerChannelService.getDealerChannelList(dealerChannel);
+                    if(dealerChannelList!= null && dealerChannelList.size() > 0){
+                        dealerChannel = dealerChannelList.get(0);
+                    }else{
+                        order.setReturnStatus("error");
+                        order.setReturnMsg("订单导入失败-查询店铺对应客户信息失败，店铺ID："+order.getStoreId()+"。");
+                        order.setPlatformOrderId("1");
+                        flag = false;
+                    }
+
+                    if(flag){
+                        if(1 == dealerChannel.getDealerSelfOperated()){
+                            //是否自营 1:自营 2:非自营
+                            String colorDiscount = "-1";
+                            colorDiscount = getValue(temp.getCell(discountColumnIndex)).trim();
+                            if(colorDiscount != null && !"".equals(colorDiscount)){
+                                colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n","");
+                            }
+                            if(colorDiscount == null || "".equals(colorDiscount)){
+                                order.setReturnStatus("error");
+                                order.setReturnMsg("价格不正确"+"。");
+                                order.setPlatformOrderId("1");
+                            }else{
+                                // 计算单个价格
+                                Double colorDiscountDou = Double.valueOf(colorDiscount);
+                                colorDiscountDou = colorDiscountDou*100/orderNumByInt;
+                                order.setOrderProductDiscount(colorDiscountDou.intValue());
+                                order.setOrderProductPrice(colorDiscountDou.intValue());
+                                //赋值小结
+                                Double orderTotal = Double.valueOf(colorDiscount);
+                                orderTotal = orderTotal*100;
+                                order.setOrderTotal(orderTotal.intValue());
+                            }
+                        }else{
+                            //2:非自营
+                            DealerProduct dealerProduct = new DealerProduct();
+                            dealerProduct.setDealerId(dealerChannel.getDealerId());
+                            dealerProduct.setColorBar(OrderProductBarCodeValue);
+                            List<DealerProduct> dealerProductList = dealerProductService.getDealerProductAndStoreList(dealerProduct);
+                            if(dealerProductList != null && dealerProductList.size() > 0){
+                                for (DealerProduct dp:dealerProductList) {
+                                    if(1 == dp.getDealProdStoreArea()){
+                                        // 1:全部店铺
+                                        order.setOrderProductDiscount(dp.getDealProdPrice());
+                                        order.setOrderProductPrice(dp.getDealProdPrice());
+                                        order.setOrderTotal(dp.getDealProdPrice()*orderNumByInt);
+                                    }else{
+                                        // 2:部分店铺
+                                        for (DealerProductStore dps:dp.getDealerProductStoreList()) {
+                                            if(order.getStoreId().equals(dps.getStoreId())){
+                                                order.setOrderProductDiscount(dp.getDealProdPrice());
+                                                order.setOrderProductPrice(dp.getDealProdPrice());
+                                                order.setOrderTotal(dp.getDealProdPrice()*orderNumByInt);
+                                            }
+                                        }
+                                    }
+                                }
+                            }else{
+                                order.setReturnStatus("error");
+                                order.setReturnMsg("订单导入-未能从该客户中获取到对应产品的信息，客户名称："+dealerChannel.getDealerName()+",产品SKU："+ OrderProductBarCodeValue+"。");
+                                order.setPlatformOrderId("1");
+                            }
+                        }
+                    }
+
+                }else{
+                    order.setReturnStatus("error");
+                    order.setReturnMsg("订单导入-获取店铺ID失败，店铺ID："+order.getStoreId()+"。");
+                    order.setPlatformOrderId("1");
+                }
+
+                if(order.getOrderTotal() == null || order.getOrderTotal() < 0){
+                    order.setReturnStatus("error");
+                    order.setReturnMsg("订单导入-未能从该客户中获取店铺对应的产品价格，客户名称："+dealerChannel.getDealerName()+",产品SKU："+ OrderProductBarCodeValue+"店铺ID："+order.getStoreId()+"。");
+                    order.setPlatformOrderId("1");
+                }
+
                 order.setOid(oid);
                 try{
                     if (postType.equals("ems")) {

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -98,7 +98,13 @@
                                     企业
                                 </#if>
                             </td>
-                            <td>${dmDealer.dealerSelfOperated!''}</td>
+                            <td>
+                                <#if dmDealer.dealerSelfOperated == 1>
+                                    自营
+                                <#elseif dmDealer.dealerSelfOperated == 2>
+                                    非自营
+                                </#if>
+                            </td>
                             <td>${dmDealer.dealerIndustry!''}</td>
                             <td>
                                 <#if dmDealer.dealerState == 1>

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

@@ -133,8 +133,8 @@
                                     <#if claimOrder.claimOrderType == 1 >
                                         <tr class="text-c order_item itemNum_${claimOrder_index}" orderItem="1">
                                             <input type="hidden" class="itemId" value="${claimOrder.itemId}">
-                                            <input type="hidden" class="itemProductDiscount" value="${((claimOrder.itemProductDiscount/100)?string("0.##"))!''}">
-                                            <td class="itemTotal">${((claimOrder.claimOrderNum) * (claimOrder.frPrice/100))!'0'}</td>
+                                            <input type="hidden" class="itemProductDiscount" value="${((claimOrder.frPrice/100/claimOrder.claimOrderNum)?string("0.##"))!''}">
+                                            <td class="itemTotal">${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
                                             <td>${claimOrder.salesDealCode!''}</td>
                                             <td>${claimOrder.storeName!''}</td>
                                             <td>${claimOrder.itemProductName!''}</td>
@@ -144,7 +144,14 @@
                                             <td>${(claimOrder.salesPayTime?string("yyyy-MM-dd"))!''}</td>
                                             <td>${claimOrder.salesAdminName!''}</td>
                                             <td>${claimOrder.salesAddressName!''}<br>${claimOrder.salesAddressTel!''}</td>
-                                            <td>${claimOrder.salesAddressInfo!''}</td>
+
+                                            <td alt="${claimOrder.salesAddressInfo!''}" title="${claimOrder.salesAddressInfo!''}">
+                                                <#if claimOrder.salesAddressInfo?length gt 15>
+                                                ${claimOrder.salesAddressInfo?substring(0,12)}...
+                                                <#else>
+                                                ${claimOrder.salesAddressInfo!''}
+                                                </#if>
+                                            </td>
                                             <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>
                                         </tr>
                                     </#if>
@@ -186,7 +193,7 @@
                                     <#if claimOrder.claimOrderType == 2 >
                                         <tr class="text-c order_item itemNum_${claimOrder_index}"  orderItem="2">
                                             <input type="hidden" class="itemId" value="${claimOrder.itemId}">
-                                            <input type="hidden" class="itemProductDiscount" value="${((claimOrder.itemProductDiscount/100)?string("0.##"))!''}">
+                                            <input type="hidden" class="itemProductDiscount" value="${((claimOrder.itemProductDiscount/100/claimOrder.claimOrderNum)?string("0.##"))!''}">
                                             <td class="itemTotal">${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
                                             <td>${claimOrder.salesDealCode!''}</td>
                                             <td>${claimOrder.storeName!''}</td>
@@ -198,7 +205,13 @@
                                             <td>${(claimOrder.salesPayTime?string("yyyy-MM-dd"))!''}</td>
                                             <td>${claimOrder.salesAdminName!''}</td>
                                             <td>${claimOrder.salesAddressName!''}<br>${claimOrder.salesAddressTel!''}</td>
-                                            <td>${claimOrder.salesAddressInfo!''}</td>
+                                            <td alt="${claimOrder.salesAddressInfo!''}" title="${claimOrder.salesAddressInfo!''}">
+                                                <#if claimOrder.salesAddressInfo?length gt 15>
+                                                ${claimOrder.salesAddressInfo?substring(0,12)}...
+                                                <#else>
+                                                ${claimOrder.salesAddressInfo!''}
+                                                </#if>
+                                            </td>
                                             <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>
                                         </tr>
                                     </#if>
@@ -303,6 +316,10 @@
                             if(isAddOrderType == 1){
                                 var itemTotal = accDiv(salesOrderItem.itemTotal,100);
                                 var html = '';
+                                var address = salesOrder.salesAddressInfo;
+                                if(address.length > 15){
+                                    address = address.substring(0,12)+'…';
+                                }
                                 html = '<tr class="text-c order_item itemNum_'+ itemNum +'" orderItem="1">' +
                                         '<input type="hidden" class="itemId" value="'+  salesOrderItem.itemId +'">' +
                                         '<input type="hidden" class="itemProductDiscount" value="'+  accDiv(itemTotal,salesOrderItem.itemNum) +'">' +
@@ -316,7 +333,7 @@
                                         ' <td>'+ time +'</td>' +
                                         ' <td>'+ salesOrder.salesAdminName +'</td>' +
                                         ' <td>'+ salesOrder.salesAddressName +'<br>'+ salesOrder.salesAddressTel + '</td>' +
-                                        ' <td>'+ salesOrder.salesAddressInfo +'</td>' +
+                                        ' <td alt="'+ salesOrder.salesAddressInfo +'" title="'+ salesOrder.salesAddressInfo +'">'+ address +'</td>' +
                                         ' <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>' +
                                         '</tr>';
                                 $("#orderAll").append(html);
@@ -324,6 +341,10 @@
                                 var itemTotal = accDiv(salesOrderItem.itemTotal,100);
                                 var dis = accDiv(itemTotal,salesOrderItem.itemNum);
                                 var html = '';
+                                var address = salesOrder.salesAddressInfo;
+                                if(address.length > 15){
+                                    address = address.substring(0,12)+'…';
+                                }
                                 html = '<tr class="text-c order_item itemNum_'+ itemNum +'"  orderItem="2">' +
                                         '<input type="hidden" class="itemId" value="'+  salesOrderItem.itemId +'">' +
                                         '<input type="hidden" class="itemProductDiscount" value="'+dis +'">' +
@@ -338,7 +359,7 @@
                                         ' <td>'+ time +'</td>' +
                                         ' <td>'+ salesOrder.salesAdminName +'</td>' +
                                         ' <td>'+ salesOrder.salesAddressName +'<br>'+ salesOrder.salesAddressTel + '</td>' +
-                                        ' <td>'+ salesOrder.salesAddressInfo +'</td>' +
+                                        ' <td alt="'+ salesOrder.salesAddressInfo +'" title="'+ salesOrder.salesAddressInfo +'">'+ address +'</td>' +
                                         ' <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>' +
                                         '</tr>';
                                 $("#returnAll").append(html);

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

@@ -83,7 +83,6 @@
                         </span>
                     </div>
 
-
                      <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
                         <select name="salesStatus" class="select" id="salesStatus"  >
                              <option value="">状态</option>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order_new.ftl

@@ -142,7 +142,7 @@
             <tr class="text-c">
                 <td width="55">产品总额</td>
                 <td style="text-align: left;" id="self_operated_id">
-                    <div style="width: 100%;height: 30px;">
+                   <#-- <div style="width: 100%;height: 30px;">
                         <div class="formControls skin-minimal self_operated_div"  style="float: left;">
                             <div class="radio-box">
                                 <input type="radio" id="self_operated_1" name="self_operated" value="1" checked >
@@ -154,13 +154,15 @@
                             </div>
                         </div>
                         <div style="float: left;line-height: 30px;color: red;">*自营店铺导单需要导入产品总额，自营店铺指淘宝，天猫，京东</div>
-                    </div>
+                    </div>-->
 
-                    <select class="my-select"  name="product-shop-discount" id="product-shop-discount" matchSelect="售价|单价|折扣价|价格|产品价格|下单价格|商品金额合计" style="height: 30px;width: 180px;margin: 0px;">
+                    <select  class="my-select"  name="product-shop-discount" id="product-shop-discount" matchSelect="售价|单价|折扣价|价格|产品价格|下单价格|商品金额合计" style="height: 30px;width: 180px;margin: 0px;float: left;">
                         <#list heads as head>
                             <option value="${head}" >${head}</option>
                         </#list>
                     </select>
+
+                    <div style="float: left;line-height: 30px;color: red;">&nbsp;&nbsp;*自营店铺导单需要导入产品总额，自营店铺指淘宝，天猫，京东，非自营不必在意该选项</div>
                 </td>
             </tr>
             <tr class="text-c">
@@ -587,13 +589,6 @@
             layer.msg('订单编号与产品数量列重复!',{icon: 5,time:3000});
             return false;
         }
-        //1自营 2非自营
-        var  self_operated = $("[name='self_operated']:checked").val();
-        if(platformOrdersName == discountArray[0] && self_operated==1){
-            layer.close(index);
-            layer.msg('订单编号与产品总金额列重复!',{icon: 5,time:3000});
-            return false;
-        }
         for(var k =0;k<infoArray.length;k++){
             if(infoArray[k] == platformOrdersName){
                 layer.close(index);
@@ -614,15 +609,15 @@
             storeArray.push(shopId);
         }
 
-//        for(var k=0;k<storeArray.length;k++){
-//            if(storeArray[k] == 3 || storeArray[k] == 40 || storeArray[k] == 86){
-//                if(self_operated == 2){
-//                    layer.close(index);
-//                    vailErrorMsg($("#self_operated_id"),"选择的店铺需要选择订单总额！",3500);
-//                    return false;
-//                }
-//            }
-//        }
+        for(var k=0;k<storeArray.length;k++){
+            if(storeArray[k] == 3 || storeArray[k] == 40 || storeArray[k] == 86){
+                if(platformOrdersName == discountArray[0] ){
+                    layer.close(index);
+                    layer.msg('订单编号与产品总金额列重复!',{icon: 5,time:3000});
+                    return false;
+                }
+            }
+        }
 
         /*Excel中的店铺名称*/
         var orderStoreInfoSt = $("#order_store_info").val();
@@ -649,8 +644,7 @@
                 "num":numArray,
                 "discount":discountArray,
                 "remark":remarkArray,
-                "orderBatch":orderBatch,
-                "selfOperated":self_operated
+                "orderBatch":orderBatch
             },
             dataType: 'json',
             async: false,

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -114,7 +114,7 @@
                     <label class="form-label col-1 col-sm-1">销售渠道：</label>
                     <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
-                        <select class="select init_company" name="salesCompanyId" id="" defValue="">
+                        <select class="select init_company" name="salesCompanyId" id="salesCompanyId" defValue="">
                         </select>
 				    </span>
                     </div>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl

@@ -132,7 +132,7 @@
                     <label class="form-label col-1 col-sm-1">销售渠道：</label>
                     <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
-                        <select class="select init_company" name="salesCompanyId" id="" ulcId="${order.salesCompanyId!""}" >
+                        <select class="select init_company" name="salesCompanyId" id="salesCompanyId" ulcId="${order.salesCompanyId!""}" >
                         </select>
 				    </span>
                     </div>

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

@@ -6,6 +6,12 @@ var allCustomerId = "";
  * 打开商品列表
  */
 function add_product() {
+    var storeId = $("#datalist_1").val();
+    var salesOrderStatus = $("#salesOrderStatus").val();
+    if(salesOrderStatus == 1 && !isEmpty(storeId)){
+        vailErrorMsg_3($("#salesCompanyId"),"请选择店铺！");
+        return false;
+    }
     layer_show("商品列表",url_path + "/admin/salesOrder/to_add_product","1000","500");
 }
 /**
@@ -236,14 +242,25 @@ function setSelectProduct(colorIds){
             if(colId == colorId){
                 flag  = false;
             }
-        })
+        });
         if(!flag){
             continue;
         }
+
+        var storeId = $("#datalist_1").val();
+        var salesOrderStatus = $("#salesOrderStatus").val();
+        if(salesOrderStatus == 1 && !isEmpty(storeId)){
+            vailErrorMsg_3($("#salesCompanyId"),"请选择店铺！");
+            return false;
+        }
+
         $.ajax({
             type: "POST",
-            data: { colorId : colorId},
-            url: url_path +"/admin/product/get_product",
+            data: {
+                colorId : colorId,
+                storeId : storeId
+            },
+            url: url_path +"/admin/salesOrder/get_product",
             success: function(data){
                 var html = "";
                 if (data.returnCode == 200 && data.returnMsg.productColorList.length > 0 ) {