Merge remote-tracking branch 'liujiankang/master'

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

@@ -100,8 +100,12 @@ public class CustomerCommon implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date relationBackReceiptDate;
 
+    /*订单关联集合*/
     private List<RelationOrder> relationOrderList = new ArrayList<>();
 
+     /*订单集合*/
+     private List<SalesOrder> salesOrderList = new ArrayList<>();
+
     public String getSalesOrderId() {
         return salesOrderId;
     }
@@ -437,4 +441,12 @@ public class CustomerCommon implements Serializable {
     public void setRelationOrderList(List<RelationOrder> relationOrderList) {
         this.relationOrderList = relationOrderList;
     }
+
+    public List<SalesOrder> getSalesOrderList() {
+        return salesOrderList;
+    }
+
+    public void setSalesOrderList(List<SalesOrder> salesOrderList) {
+        this.salesOrderList = salesOrderList;
+    }
 }

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

@@ -40,6 +40,12 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     private CustomerInfoMapper customerInfoMapper;
     @Autowired
     private PostageMapper postageMapper;
+    @Autowired
+    private RelationOrderMapper relationOrderMapper;
+    @Autowired
+    private SalesOrderMapper salesOrderMapper;
+
+
 
     @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
@@ -70,6 +76,22 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     public List<CustomerCommon> listCustomerCommon(CustomerCommon customerCommon) {
         List<CustomerCommon> customerCommonList  = customerCommonMapper.listCustomerCommon(customerCommon);
 
+        for (CustomerCommon c : customerCommonList) {
+            RelationOrder relationOrder = new RelationOrder();
+            relationOrder.setRelationId(c.getRelationId());
+            relationOrder.setRelationType(c.getCustomerIsSolve());
+            List<RelationOrder> relationOrderList = relationOrderMapper.getRelationOrderList(relationOrder);
+            List<SalesOrder> orderList = new ArrayList<>();
+            for (RelationOrder ro : relationOrderList) {
+                SalesOrder salesOrder = salesOrderMapper.getSalesOrderById(ro.getSalesId());
+                SalesOrderItem salesOrderItem = new SalesOrderItem();
+                salesOrderItem.setItemOrderId(salesOrder.getSalesId());
+                salesOrder.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(salesOrderItem));
+                orderList.add(salesOrder);
+            }
+            c.setSalesOrderList(orderList);
+        }
+
 //        List<CustomerCommon> customerCommonList = new ArrayList<>();
 //        /*换新*/
 //        Renewed renewed = (Renewed)CustomerCommonUtil.getRelation(3,customerCommon);

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

@@ -4,8 +4,7 @@
 
     <select id="listCustomerCommon" parameterType="CustomerCommon" resultType="CustomerCommon">
         SELECT
-            cc.*,
-            oi.sales_orderId AS salesOrderId
+            cc.*
         FROM (
             SELECT
                 '3' AS customerIsSolve,
@@ -168,7 +167,6 @@
             FROM tb_rst_noreason_back
         )cc
         LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
-        LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
         <where>
             <if test="customerId != null and customerId != ''">
                 AND cc.customerId = #{customerId}

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

@@ -1891,6 +1891,15 @@ public class AdminCustomerController {
             return new ResponseJson(500, "该条客诉已在申请邮费中了", 500);
         }
 
+        String orderId = "";
+        for (SalesOrder salesOrder : customerCommon.getSalesOrderList()){
+            if("".equals(orderId)){
+                orderId = salesOrder.getSalesOrderId();
+            }else{
+                orderId += ","+salesOrder.getSalesOrderId();
+            }
+        }
+
         Integer flag = 0;
         Postage postage = new Postage();
         postage.setCompanyId(customerInfo.getCompanyId());      //销售公司
@@ -1900,7 +1909,7 @@ public class AdminCustomerController {
         postage.setPostageManagerStatus(1);     //------考虑手动点, 直接变为申请中
         postage.setPostageOrderSource(customerInfo.getStoreId());   //店铺id
         postage.setPostageTreatmentMethod(customerCommon.getCustomerIsSolve()); //处理方式
-        postage.setSalesOrderId(customerCommon.getSalesOrderId());       //efast订单号
+        postage.setSalesOrderId(orderId);       //efast订单号
         postage.setPostageClientName(customerCommon.getRelationBackName());
         postage.setPostageClientTel(customerCommon.getRelationBackTel());
         postage.setPostageClientAddress(customerCommon.getRelationSendAddress());

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

@@ -435,7 +435,7 @@
                 </div>
             </div>
             <div class="row cl" id="renewedProduct" style="">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span><span id="relationProduct">换新产品</span>：</label>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span><span id="relationProduct">寄回产品</span>：</label>
                 <div class="formControls col-9 col-sm-9 text-c" id="produceSelect">
 
                     <table class="table table-border table-bg table-bordered">
@@ -514,7 +514,7 @@
                  </div>
               </div>
             <div class="row cl" id="updateProduct" style="display: none;">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>更换产品：</label>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄出产品：</label>
                 <div class="formControls col-9 col-sm-9" >
 
                     <table class="table table-border table-bg table-bordered">

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

@@ -300,6 +300,9 @@
 
 <script>
 
+    /*  1为选择的订单    2:为新添加的订单 */
+    var type = 1;
+
     $(function () {
         /*选择店铺*/
         $("[name='companyId']").change(function (){
@@ -413,13 +416,19 @@
     /**
      * 选择订单，返回订单内容到父级
      */
-    function selectOrderInfo() {
+    function selectOrderInfo(newOrderId) {
         var orderId = "";
-        $(".sales_order_id").each(function(){
-            if($(this).is(':checked')){
-                orderId += $(this).val() + "_";
+        if(type == 1){
+            $(".sales_order_id").each(function(){
+                if($(this).is(':checked')){
+                    orderId += $(this).val() + "_";
+                }
+            })
+        }else{
+            if(newOrderId != null){
+                orderId = newOrderId  + "_";;
             }
-        })
+        }
         parent.setSelectOrder(orderId);
         parent.layer.close(parent.layer.getFrameIndex(window.name));
     }
@@ -494,6 +503,7 @@
                 if (data) {
                     var index = layer.alert(data.resultMsg, function () {
                         if (data.resultCode == 200) {
+                            type = 2;
                             selectOrderInfo(data.returnMsg.orderId);
                         } else {
                             layer.close(index);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -252,7 +252,7 @@
     </div>
 </div>
 
-<div  style="padding: 0px;margin: 0px;display: nonde;" >
+<div  style="padding: 0px;margin: 0px;display: none;" >
     <div id="printlist" style="">
         <ul style=" height: 460px;margin-left: 20px;margin-right: 20px;">
             <li style="font-size: 23px;height: 25px;display: block;text-align: center;font-weight: bold;margin-top: 15px">商品换货退货退款审批</li>

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

@@ -195,8 +195,8 @@ var isSolve = {
 var isSolveTitleMsg = {
     solved : [[],[]],
     noSolved : [[],[]],
-    renewed : [["退回产品","退回产品颜色","退回产品配件","机器编码"],["寄出产品","寄出产品颜色","寄出产品配件"]],
-    maintain : [["寄回的产品","寄回的产品颜色","寄回的产品配件","机器编码"],["维修发出产品","维修发出产品颜色","维修发出产品配件"]],
+    renewed : [["寄回产品","寄回产品颜色","退回产品配件","机器编码"],["寄出产品","寄出产品颜色","寄出产品配件"]],
+    maintain : [["寄回产品","寄回产品颜色","寄回产品配件","机器编码"],["寄出产品","寄出产品颜色","寄出产品配件"]],
     reissue : [[],["补发产品","补发产品颜色","补发产品配件"]],
     backGoods : [["退回产品","退回产品颜色","退回产品配件","机器编码"],[]],
     noReasonBack : [["退回产品","退回产品颜色","退回产品配件","机器编码"],[]]
@@ -627,8 +627,8 @@ function otherHied(){
     $("#recipientAddress").hide();
     $("#recipientAddressText").hide();
     $("#renewedProduct").hide();
-    $("#TDScollect").hide();
-    $("#TDScollectShow").hide();
+    $("#TDScollect").show();
+    $("#TDScollectShow").show();
     $("#sendAddressInfo").hide();
     $("#sendAddressByPhone").hide();
     $("#updateProduct").hide();