修改bug文档bug

watero-rst-interface/src/main/java/com/iamberry/rst/faces/product/ProductService.java

@@ -103,4 +103,7 @@ public interface ProductService {
      * @return
      */
     ProductColor getProduceColor(Integer colorId);
+
+    //根据客诉id查询产品类型
+    ProductType getProductType(Integer customerId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -148,5 +148,10 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.getProduceColor(colorId);
     }
 
+    @Override
+    public ProductType getProductType(Integer customerId) {
+        return productMapper.getProductType(customerId);
+    }
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/ProductMapper.java

@@ -84,5 +84,6 @@ public interface ProductMapper {
      */
     Product getProductByFittingsId(Integer fittingsId);
 
-
+    //根据客诉id查询产品类型
+    ProductType getProductType(Integer customerId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -208,4 +208,10 @@
         WHERE
          pf.fittings_id = #{fittingsId}
     </select>
+
+    <select id="getProductType" resultType="ProductType" parameterType="Integer">
+        select * from tb_rst_product_type pt
+        LEFT JOIN tb_rst_customer_info ci on ci.type_id = pt.type_id
+        WHERE ci.customer_id = #{customerId}
+    </select>
 </mapper>

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

@@ -1866,5 +1866,31 @@ public class AdminCustomerController {
         return rj;
     }
 
+
+    /**
+     * 根据客诉id查询产品类型
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/getProductType")
+    public ResponseJson getProductType(HttpServletRequest request) throws Exception {
+        String customerId = request.getParameter("customerId");
+        if (!StringUtils.isNotEmpty(customerId)) {
+            return new ResponseJson(500, "查询产品类型失败!", 500);
+        }
+        //查询客诉产品类型
+        ProductType productType = productService.getProductType(Integer.valueOf(customerId));
+        if (productType == null) {
+            return new ResponseJson(500, "未找到产品类型!", 500);
+        } else {
+            ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("productType", productType);
+            return rj;
+        }
+    }
+
 }
 

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

@@ -190,7 +190,8 @@
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
-
+    //产品类型
+    var productType = null;
     $(function(){
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
     // #tab_demo 父级id
@@ -210,7 +211,7 @@
             increaseArea: '20%'
         });
         get_reissue_info();
-
+        get_product_type();
         /*/!* 监听寄回状态按钮 *!/
         $("input[name='reissueSendStatus']").change(function (){
             initBackInfo($(this).val());
@@ -397,7 +398,16 @@
         var reissueSendStatus = $('input[name="reissueSendStatus"]:checked').val();//寄回状态
         var reissueSendLogisticsCompany = $('#reissueSendLogisticsCompany').val();//寄出物流公司
         var reissueSendLogisticsNo = $('#reissueSendLogisticsNo').val();//寄出物流单号
-        if (reissueSendLogisticsCompany == 1) {
+        if (reissueSendStatus == 1) {
+            var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
+            if (productType != 2) {
+                var reissueBackEfastOrderId = $('#reissueBackEfastOrderId').val();//efast订单号
+                if (reissueBackEfastOrderId == null || reissueBackEfastOrderId == '') {
+                    layer.msg("Efast订单号不能为空!", {icon: 5, time: 1000});
+                    reissue_flag = false;
+                    return reissue_flag;
+                }
+            }
 //            if (reissueSendLogisticsCompany != null && reissueSendLogisticsCompany != '') {
 //                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
 //                reissue_flag = false;
@@ -408,7 +418,7 @@
 //                reissue_flag = false;
 //                return reissue_flag;
 //            }
-        } else if (reissueSendLogisticsCompany == 2 || reissueSendLogisticsCompany == 3) {
+        } else if (reissueSendStatus == 2 || reissueSendStatus == 3) {
             if (reissueSendLogisticsCompany == null || reissueSendLogisticsCompany == '') {
                 layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                 reissue_flag = false;
@@ -439,7 +449,23 @@
         $('#reissueAreaNumber option').remove();
         getDistrict('reissueAreaNumber',city);
     });
-
+    /*获取产品信息*/
+    function get_product_type() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId}},
+            url: "${path}/admin/customer/getProductType",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    productType = data.returnMsg.productType.typeCompany;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
 </script>
 </body>
 </html>

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

@@ -367,6 +367,8 @@
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
 <script type="text/javascript">
+    //产品类型
+    var productType = null;
     $(function(){
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
     // #tab_demo 父级id
@@ -389,7 +391,7 @@
         });
         get_renewed_info();
         showUpdateSendProduct();
-
+        get_product_type();
         /*/!* 监听寄回状态按钮 *!/
         $("input[name='renewedBackStatus']").change(function (){
             initBackInfo($(this).val());
@@ -905,6 +907,15 @@
             var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
 
             if (renewedSendStatus == 1) {
+                var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
+                if (productType != 2) {
+                    var renewedBackEfastOrderId = $('#renewedBackEfastOrderId').val();//efast订单号
+                    if (renewedBackEfastOrderId == null || renewedBackEfastOrderId == '') {
+                        layer.msg("Efast订单号不能为空!", {icon: 5, time: 1000});
+                        renewed_flag = false;
+                        return renewed_flag;
+                    }
+                }
 //            if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
 //                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
 //                renewed_flag = false;
@@ -1007,7 +1018,24 @@
         $('#areaNumber option').remove();
         getDistrict('areaNumber',cityId);
     });
-
+    /*获取产品信息*/
+    function get_product_type() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId}},
+            url: "${path}/admin/customer/getProductType",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    productType = data.returnMsg.productType.typeCompany;
+                    alert(productType);
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
 </script>
 </body>
 </html>

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

@@ -367,6 +367,8 @@
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
 <script type="text/javascript">
+    //产品类型
+    var productType = null;
     $(function(){
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
     // #tab_demo 父级id
@@ -389,7 +391,7 @@
         });
         get_repair_info();
         showUpdateSendProduct();
-
+        get_product_type();
         /*/!* 监听寄回状态按钮 *!/
         $("input[name='repairBackStatus']").change(function (){
             initBackInfo($(this).val());
@@ -818,9 +820,7 @@
         var repairBackLogisticsCompany = $("#repairBackLogisticsCompany option:selected").val();//寄回物流公司
         var repairBackName = $('#repairBackName').val();//寄件人姓名
         var repairBackTel = $('#repairBackTel').val();//寄件人电话
-
         if(type == 1){
-            var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
             if (repairBackStatus == 1) {
 //            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
 //                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
@@ -901,11 +901,20 @@
                 }
             }
         }else if(type == 3){
-            var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄回状态
+            var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄出状态
             var repairSendLogisticsCompany = $('#repairSendLogisticsCompany').val();//寄出物流公司
             var repairSendLogisticsNo = $('#repairSendLogisticsNo').val();//寄出物流单号
 
             if (repairSendStatus == 1) {
+                var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
+                if (productType != 2) {
+                    var repairBackEfastOrderId = $('#repairBackEfastOrderId').val();//efast订单号
+                    if (repairBackEfastOrderId == null || repairBackEfastOrderId == '') {
+                        layer.msg("Efast订单号不能为空!", {icon: 5, time: 1000});
+                        repair_flag = false;
+                        return repair_flag;
+                    }
+                }
 //            if (repairSendLogisticsCompany != null && repairSendLogisticsCompany != '') {
 //                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
 //                repair_flag = false;
@@ -1009,6 +1018,24 @@
         getDistrict('repairAreaNumber',cityId);
     });
 
+
+    /*获取产品信息*/
+    function get_product_type() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId}},
+            url: "${path}/admin/customer/getProductType",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    productType = data.returnMsg.productType.typeCompany;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
 </script>
 </body>
 </html>

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

@@ -997,7 +997,7 @@ function setSelectOrder(orderId){
                     html += '' +
                         ' <td style="text-align: center;">'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                         ' <td style="text-align: center;">'+  convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                        ' <td style="text-align: center;">'+ salesOrder.salesId +'</td>' +
+                        ' <td style="text-align: center;">'+ salesOrder.salesOrderId +'</td>' +
                         ' <td style="text-align: center;">'+ salesOrder.salesAddressName +'</td>' +
                         ' <td style="text-align: center;">'+ salesOrder.salesAddressTel +'</td>' +
                         ' <td style="text-align: center;">'+ salesOrder.salesAmount/100 +'</td>' +