Merge remote-tracking branch 'liujiankang/master'

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

@@ -502,6 +502,16 @@ public class CustomerServiceImpl implements CustomerService {
     @Transactional
     public void setName(CmRelation cr) {
         for (int i=0;i<cr.getSendProdcues().size();i++) {
+            if("123456".equals(cr.getSendProdcues().get(i).getColorBar())){
+                continue;
+            }
+            if("6970465730030".equals(cr.getSendProdcues().get(i).getColorBar())){
+                continue;
+            }
+            if("6970465730023".equals(cr.getSendProdcues().get(i).getColorBar())){
+                continue;
+            }
+
             ProductColor productColor = productMapper.getProductBySku(cr.getSendProdcues().get(i).getColorBar());
             cr.getSendProdcues().get(i).setProductColor(productColor);
             cr.getSendProdcues().get(i).setColorId(productColor.getColorId());
@@ -512,6 +522,15 @@ public class CustomerServiceImpl implements CustomerService {
             cr.getSendProdcues().get(i).setProductNumber(product.getProductNumber());
         }
         for (int i=0;i<cr.getClosedProdcues().size();i++) {
+            if(("123456").equals(cr.getClosedProdcues().get(i).getColorBar())){
+                continue;
+            }
+            if(("6970465730030").equals(cr.getClosedProdcues().get(i).getColorBar())){
+                continue;
+            }
+            if(("6970465730023").equals(cr.getClosedProdcues().get(i).getColorBar())){
+                continue;
+            }
             ProductColor productColor = productMapper.getProductBySku(cr.getClosedProdcues().get(i).getColorBar());
             cr.getClosedProdcues().get(i).setProductColor(productColor);
             cr.getClosedProdcues().get(i).setColorId(productColor.getColorId());
@@ -1323,6 +1342,7 @@ public class CustomerServiceImpl implements CustomerService {
 
 
     @Override
+    @Transactional
     public Integer updateRelation(CustomerInfo customerInfo) {
          /*
         * 查询客诉
@@ -1342,6 +1362,12 @@ public class CustomerServiceImpl implements CustomerService {
         CmRelation cmRelation = new CmRelation();
         cmRelation.setCustomerId(customerInfo.getCustomerId());
 
+        /*判断是否是新加的客诉*/
+        CmRelation crold = cmRelationMapper.getCmRelationByCustomerId(customerInfo.getCustomerId());
+        if(crold != null ){
+            return 1;
+        }
+
         CustomerCommon customerCommon = new CustomerCommon();
         customerCommon.setCustomerId(customerInfo.getCustomerId());
         List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
@@ -1373,6 +1399,9 @@ public class CustomerServiceImpl implements CustomerService {
             cmRelation.setRelationCustomerCosts(customerCommon.getRelationCustomerCosts());  //客户报价
             cmRelation.setRelationCreateTime(customerCommon.getRelationCreateTime());
             cmRelation.setRelationUpdateTime(customerCommon.getRelationUpdateTime());
+
+            cmRelation.setSendProdcues(customerCommon.getSendProdcues());
+            cmRelation.setClosedProdcues(customerCommon.getClosedProdcues());
         }
 
         Integer procMethodId;
@@ -1462,9 +1491,6 @@ public class CustomerServiceImpl implements CustomerService {
             rol.setRelationId(customerCommon.getRelationId());
             relationOrderService.deleteByRelationOrder(rol);
 
-            /*产品整理*/
-            customerService.setName(cmRelation);
-
             /*添加客诉-添加处理与订单关联表 ---------- */
             List<RelationOrder> relationAndOrderList = new ArrayList<>();
             for (RelationOrder sokk : relationOrderList) {
@@ -1478,13 +1504,24 @@ public class CustomerServiceImpl implements CustomerService {
                 relationOrderService.saveList(relationAndOrderList);
             }
 
-            CustomerCommonUtil.setProduce(cmRelation);
-            if(cmRelation.getClosedProdcues() != null && cmRelation.getClosedProdcues().size()>0){
-                closedProdcueMapper.insert(cmRelation.getClosedProdcues());
-            }
-            if(cmRelation.getSendProdcues() != null && cmRelation.getSendProdcues().size() > 0){
-                sendProdcueMapper.insert(cmRelation.getSendProdcues());
-            }
+            Integer fl =  0;
+             /*产品整理*/
+             try{
+                 customerService.setName(cmRelation);
+                 fl = 1;
+             }catch (Exception e){
+                 e.printStackTrace();
+             }
+
+             if(fl == 1){
+                 CustomerCommonUtil.setProduce(cmRelation);
+                 if(cmRelation.getClosedProdcues() != null && cmRelation.getClosedProdcues().size()>0){
+                     closedProdcueMapper.insert(cmRelation.getClosedProdcues());
+                 }
+                 if(cmRelation.getSendProdcues() != null && cmRelation.getSendProdcues().size() > 0){
+                     sendProdcueMapper.insert(cmRelation.getSendProdcues());
+                 }
+             }
         }
         return flag;
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/closedProdcueMapper.xml

@@ -48,9 +48,6 @@
       <if test="relationId != null and relationId != ''">
         relation_id = #{relationId}
       </if>
-      <if test="relationId != null and relationId != ''">
-        relation_id = #{relationId}
-      </if>
       <if test="closedProdcueId != null and closedProdcueId != ''">
         and closed_prodcue_id = #{closedProdcueId}
       </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerCommonMapper.xml

@@ -37,7 +37,9 @@
         renewed_is_transfer AS relationIsTransfer,
         renewed_alipay_name AS relationAlipayName,
         NULL	AS relationFactoryCosts,
-        NULL AS relationCustomerCosts
+        NULL AS relationCustomerCosts,
+        renewed_create_time AS  relationCreateTime,
+        renewed_update_time AS  relationUpdateTime
         FROM tb_rst_renewed
         UNION ALL
         SELECT
@@ -71,7 +73,9 @@
         repair_is_transfer AS relationIsTransfer,
         repair_alipay_name AS relationAlipayName,
         repair_factory_costs AS relationFactoryCosts,
-        repair_customer_costs AS relationCustomerCosts
+        repair_customer_costs AS relationCustomerCosts,
+        repair_create_time AS  relationCreateTime,
+        repair_update_time AS  relationUpdateTime
         FROM tb_rst_repair
         UNION ALL
         SELECT
@@ -105,7 +109,9 @@
         NULL AS relationIsTransfer,
         NULL AS relationAlipayName,
         NUll	AS relationFactoryCosts,
-        NUll AS relationCustomerCosts
+        NUll AS relationCustomerCosts,
+        reissue_create_time AS  relationCreateTime,
+        reissue_update_time AS  relationUpdateTime
         FROM tb_rst_reissue
         UNION ALL
         SELECT
@@ -139,7 +145,9 @@
         back_goods_is_transfer AS relationIsTransfer,
         back_goods_alipay_name AS relationAlipayName,
         NULL	AS relationFactoryCosts,
-        NULL AS relationCustomerCosts
+        NULL AS relationCustomerCosts,
+        back_goods_create_time AS  relationCreateTime,
+        back_goods_update_time AS  relationUpdateTime
         FROM tb_rst_back_goods
         UNION ALL
         SELECT
@@ -173,7 +181,9 @@
         noreason_back_is_transfer AS relationIsTransfer,
         noreason_back_alipay_name AS relationAlipayName,
         NULL AS relationFactoryCosts,
-        NULL AS relationCustomerCosts
+        NULL AS relationCustomerCosts,
+        noreason_back_create_time AS  relationCreateTime,
+        noreason_back_update_time AS  relationUpdateTime
         FROM tb_rst_noreason_back
         )cc
         LEFT JOIN tb_rst_cm_customer_info c on cc.customerId = c.customer_id

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -198,16 +198,18 @@ public class AdminCustomerController {
             for (int k = 0; k < relationOrderList.size(); k++) {
                 salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
             }
-            SalesOrder so = new SalesOrder();
-            so.setSalesIds(salesIds);
-            List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
-            for (SalesOrder sor : orderList) {
-                SalesOrderItem salesOrderItem = new SalesOrderItem();
-                salesOrderItem.setItemOrderId(sor.getSalesId());
-                List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
-                sor.setSalesOrderItemList(salesOrderItemList);
+            if(salesIds!=null && salesIds.length > 0){
+                SalesOrder so = new SalesOrder();
+                so.setSalesIds(salesIds);
+                List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
+                for (SalesOrder sor : orderList) {
+                    SalesOrderItem salesOrderItem = new SalesOrderItem();
+                    salesOrderItem.setItemOrderId(sor.getSalesId());
+                    List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
+                    sor.setSalesOrderItemList(salesOrderItemList);
+                }
+                mv.addObject("salesOrderList", orderList);
             }
-            mv.addObject("salesOrderList", orderList);
         } else {
             mv.addObject("salesOrderList", null);
         }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AppComplaintQuestionInfoController.java

@@ -406,40 +406,40 @@ public class AppComplaintQuestionInfoController {
      * @param request
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "/updateRelation")
-    public ResponseJson updateRelation(HttpServletRequest request){
-
-        System.out.println("++++++ 处理方式数据迁移开始 ++++++++");
-        logger.info("++++++ 处理方式数据迁移开始 ++++++++");
-        ResponseJson msg = new ResponseJson();
-        SalesOrder salesOrder = new SalesOrder();
-        CustomerInfo customerInfo  = new CustomerInfo();
-        Integer pageNo = 1;
-        while (true) {
-            PagedResult<CustomerInfo> pagedResult = customerService.listCustomer(pageNo, 20, customerInfo, false);
-            System.out.println("pageNo:"+ pageNo);
-            logger.info("pageNo:"+ pageNo);
-
-            List<CustomerInfo> customerList = pagedResult.getDataList();
-            for (CustomerInfo cm:customerList) {
-                System.out.println("客诉Id:"+ cm.getCustomerId());
-                logger.info("客诉Id:"+ cm.getCustomerId());
-                Integer falg = customerService.updateRelation(cm);
-                if(falg < 1){
-                    System.out.println("转换失败"+ cm.getCustomerId());
-                    logger.info("转换失败"+ cm.getCustomerId());
-                }
-            }
-            if(customerList.size() < 20){
-                break;
-            }
-            pageNo++;
-        }
-        System.out.println("++++++ 处理方式数据迁移结束 ++++++++");
-        logger.info("++++++ 处理方式数据迁移结束 ++++++++");
-        return msg;
-    }
+//    @ResponseBody
+//    @RequestMapping(value = "/updateRelation")
+//    public ResponseJson updateRelation(HttpServletRequest request){
+//
+//        System.out.println("++++++ 处理方式数据迁移开始 ++++++++");
+//        logger.info("++++++ 处理方式数据迁移开始 ++++++++");
+//        ResponseJson msg = new ResponseJson();
+//        SalesOrder salesOrder = new SalesOrder();
+//        CustomerInfo customerInfo  = new CustomerInfo();
+//        Integer pageNo = 349;
+//        while (true) {
+//            PagedResult<CustomerInfo> pagedResult = customerService.listCustomer(pageNo, 20, customerInfo, false);
+//            System.out.println("pageNo:"+ pageNo);
+//            logger.info("pageNo:"+ pageNo);
+//
+//            List<CustomerInfo> customerList = pagedResult.getDataList();
+//            for (CustomerInfo cm:customerList) {
+//                System.out.println("客诉Id:"+ cm.getCustomerId());
+//                logger.info("客诉Id:"+ cm.getCustomerId());
+//                Integer falg = customerService.updateRelation(cm);
+//                if(falg < 1){
+//                    System.out.println("转换失败"+ cm.getCustomerId());
+//                    logger.info("转换失败"+ cm.getCustomerId());
+//                }
+//            }
+//            if(customerList.size() < 20){
+//                break;
+//            }
+//            pageNo++;
+//        }
+//        System.out.println("++++++ 处理方式数据迁移结束 ++++++++");
+//        logger.info("++++++ 处理方式数据迁移结束 ++++++++");
+//        return msg;
+//    }
 
 
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -368,7 +368,12 @@
                      </span>
                 </div>
             </div>
-
+            <div class="row cl" id="">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-9 col-sm-9">
+                    <span id="procMethodDesc">补充说明：</span>
+                </div>
+            </div>
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
@@ -514,16 +519,16 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编号</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addBackProduct">
                         <tr id="">
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </tbody>
                     </table>
@@ -542,16 +547,16 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编号</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addSendProduct">
                         <tr id="">
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td  class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </tbody>
                     </table>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -357,6 +357,13 @@
                 </div>
             </div>
 
+            <div class="row cl" id="">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-9 col-sm-9">
+                    <span id="procMethodDesc">补充说明：${procMethod.procMethodDesc!''}</span>
+                </div>
+            </div>
+
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
@@ -531,11 +538,11 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table1">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编码</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addBackProduct">
@@ -562,7 +569,7 @@
                             </#list>
                         <#else >
                         <tr>
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </#if>
                         </tbody>
@@ -582,11 +589,11 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编码</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addSendProduct">
@@ -613,7 +620,7 @@
                                 </#list>
                             <#else >
                                 <tr>
-                                    <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                                    <td class="notSelectOrder"  style="text-align: center;" colspan="5">选择订单后展示</td>
                                 </tr>
                             </#if>
                         </tbody>
@@ -993,7 +1000,11 @@
      * 设置省市区
      */
     function setAddressInfo(){
-        ulcRelationAddress.setUlcById(0,${cmRelation.provinceNumber!''},${cmRelation.cityNumber!''},${cmRelation.areaNumber!''});
+        var provinceNumber = ${cmRelation.provinceNumber!'"xxxxx"'};
+        if(provinceNumber != "xxxxx"){
+            ulcRelationAddress.setUlcById(0,${cmRelation.provinceNumber!'1'},${cmRelation.cityNumber!'1'},${cmRelation.areaNumber!'1'});
+        }
+
 
         <#--var proId = setPro(null,1);  //创建省-->
         <#--<#if cmRelation.provinceNumber?? >-->

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

@@ -409,6 +409,7 @@ function initProduceType(){
  */
 function ulcProcessResult(data){
     initProcessResult(data[1].procMethodIsBack,data[1].procMethodIsSend);
+    $("#procMethodDesc").html("补充说明："+data[1].procMethodDesc);
 }
 
 /**
@@ -459,8 +460,9 @@ function initProcessResult(procMethodIsBack,procMethodIsSend){
         $("#salesChannelsSelect").show();  //展示销售公司
         $("#TDScollect").show();
 
-        if((procMethodIsBack == 2 && procMethodIsSend == 2) || isNeedSelectOrder == 2){ //不需要寄回，不需要寄出就是 已解决，未解决
+        if((procMethodIsBack == 2 && procMethodIsSend == 2)){ //不需要寄回，不需要寄出就是 已解决，未解决
             visitByType(1);
+            isNeedSelectOrder == 2
         }
 
         var promType = $("#procTypeId").val() //查看是否为维修
@@ -1710,26 +1712,36 @@ function setSelectProduct(colorIds){
                     for(var i=0;i<data.returnMsg.productColorList.length;i++){
                         var productColor = data.returnMsg.productColorList[i];
                         html += '<tr >'
-                            + '<td style="text-align: center;" >' + cufte(productColor.productName) + '</td>'
-                            + '<td style="text-align: center;" >' + cufte(productColor.colorName) + '</td>'
-                            + '<td style="text-align: center;"><input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="1"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>'
-                            + '<td style="text-align: center;" >'
+                            + '<td width="80" style="text-align: center;" >' + cufte(productColor.productName) + '</td>'
+                            + '<td width="40" style="text-align: center;" >' + cufte(productColor.colorName) + '</td>'
+                            + '<td width="20" style="text-align: center;"><input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="1"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>'
+                            + '<td width="100" style="text-align: center;" >'
                             + '<input type="hidden" class="input-produce-id" value="' + productColor.colorProductId + '">'
                             + '<input type="hidden" class="input-fc-id" value="' + productColor.colorId +'">'
                             + '<input type="hidden" class="input-69code" value="' + productColor.colorBar +'">'
                             + '<input type="" class="input-text input-number input-code" style="width: 100%;border: none;text-align: center;" value="" placeholder="机器编号" name="" id="item-' + productColor.colorProductId + '-' + productColor.colorId +'" number="1" "  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >'
                             + '</td>'
-                            + '<td style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>'
+                            + '<td width="20" style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>'
                             + '</tr>';
                     }
                 }else{
                     layer.msg("添加产品失败！", {icon: 5, time: 3000});
                 }
-                if(productAddType == 2){
-                    $("#addSendProduct").append(html);
-                }else if(productAddType == 1){
-                    $("#addBackProduct").append(html);
+                var notSelectOrderHtml = $("#addSendProduct").find(".notSelectOrder").html();
+                if(!isEmpty(notSelectOrderHtml)){
+                    if(productAddType == 2){
+                        $("#addSendProduct").append(html);
+                    }else if(productAddType == 1){
+                        $("#addBackProduct").append(html);
+                    }
+                }else{
+                    if(productAddType == 2){
+                        $("#addSendProduct").html(html);
+                    }else if(productAddType == 1){
+                        $("#addBackProduct").html(html);
+                    }
                 }
+
             }
         });
     }

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

@@ -122,8 +122,8 @@ function setSelectCustomer(customerId){
                 $("#salesAddressTel").val(customer.customerTel);
                 /* 售后订单的支付时间、支付方式默认 */
                 $("#salesPayTime").val(customer.salesTime);
-                sc.setUlcById(0,1,11);
-                ulc.setUlcByName(0,"省","市","区");
+                // sc.setUlcById(0,1,11);
+                // ulc.setUlcByName(0,"省","市","区");
             }else{
             }
             $("#salesCustomer").show();