修改bug

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

@@ -71,6 +71,9 @@ public class CustomerInfo  implements Serializable {
     private Integer backStatus;         //寄回状态
     private Integer sendStatus;         //寄送状态
 
+    /*设置客诉列表查询条件*/
+    private String sendLogisticsNo;     //物流单号
+
     /*关联客诉产品类型*/
     private Integer typeCompany;    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
 
@@ -572,4 +575,12 @@ public class CustomerInfo  implements Serializable {
     public void setDescribeId(Integer describeId) {
         this.describeId = describeId;
     }
+
+    public String getSendLogisticsNo() {
+        return sendLogisticsNo;
+    }
+
+    public void setSendLogisticsNo(String sendLogisticsNo) {
+        this.sendLogisticsNo = sendLogisticsNo;
+    }
 }

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

@@ -61,6 +61,8 @@ public class SalesOrder implements Serializable {
     private String companyName;             //销售公司名称
     private String storeName;               //店铺名称
 
+    private String storeEfast;               //Efast 的店铺id
+
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;                 //开始时间
@@ -443,4 +445,12 @@ public class SalesOrder implements Serializable {
     public void setStoreName(String storeName) {
         this.storeName = storeName;
     }
+
+    public String getStoreEfast() {
+        return storeEfast;
+    }
+
+    public void setStoreEfast(String storeEfast) {
+        this.storeEfast = storeEfast;
+    }
 }

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

@@ -114,7 +114,7 @@ public class CustomerServiceImpl implements CustomerService {
             visit.setVisitStatus(1);    //回访状态
             flag = visitMapper.addVisitInfo(visit);
             if(flag < 1){
-                throw new RuntimeException("添加客诉回访失败");
+                throw new RuntimeException("添加客诉回访信息失败");
             }
             logger.info("-----------添加客诉-添加客诉回访信息---------------");
         }
@@ -768,6 +768,8 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderAddress(customerCommon.getRelationSendAddress());
         efastOrder.setOrderStatus(2);
 
+        efastOrder.setOrderStoreId(salesOrder.getStoreEfast());   //设置efast店铺id
+
         efastOrder.setOrderNum(num); //产品数量
         efastOrder.setOrderAmount(amout);   //商品总价
         efastOrder.setOrderPayMoney(amout); //已付款

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

@@ -92,8 +92,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         if (list == null || list.size() == 0) {
             return false;
         }
+        SalesOrder verifyOrder = new SalesOrder();
+        verifyOrder.setSalesOrderId(salesOrder.getSalesOrderId());
         //查询该订单是否存在，如果存在，不需要再次添加到订单中
-        int count = salesOrderMapper.getOrderInfoCount(salesOrder);
+        int count = salesOrderMapper.getOrderInfoCount(verifyOrder);
         if (count > 0) {
             return true;
         }

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

@@ -137,6 +137,29 @@
       <if test="visitDesignatedAdminId != null">
         and v.designated_admin_id = #{visitDesignatedAdminId}
       </if>
+      <if test="sendLogisticsNo != null and sendLogisticsNo != ''">
+        and c.customer_id in (
+            SELECT customer_id
+            FROM tb_rst_renewed trr
+            WHERE renewed_send_logistics_no = #{sendLogisticsNo} OR renewed_back_logistics_no = #{sendLogisticsNo}
+            UNION ALL
+            SELECT customer_id
+            FROM tb_rst_repair
+            WHERE repair_send_logistics_no =#{sendLogisticsNo} OR repair_back_logistics_no = #{sendLogisticsNo}
+            UNION ALL
+            SELECT customer_id
+            FROM tb_rst_reissue
+            WHERE reissue_send_logistics_no = #{sendLogisticsNo}
+            UNION ALL
+            SELECT customer_id
+            FROM tb_rst_back_goods
+            WHERE back_goods_back_logistics_no = #{sendLogisticsNo}
+            UNION ALL
+            SELECT customer_id
+            FROM tb_rst_noreason_back
+            WHERE noreason_back_back_logistics_no = #{sendLogisticsNo}
+        )
+      </if>
     </where>
     ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>

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

@@ -45,6 +45,7 @@
     select 
       	t.*,
       	trsc.company_name companyName,
+      	trsi.store_efast  storeEfast,
         trsi.store_name  storeName
     from tb_rst_sales_order_info t
     LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -256,6 +256,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         orderData.put("postscript", "");												// 买家留言
 
         orderData.put("sd_id", StringUtils.isEmpty(order.getOrderStoreId()) ? SD_ID : order.getOrderStoreId());	// 对应 efast 店铺 id
+
         orderData.put("shipping_fee", 0);												// 快递费
         if(StringUtils.isEmpty(order.getOrderPostType()) || "2".equals(order.getOrderPostType())){
             orderData.put("shipping_name", "sto");										// 快递公司代码

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

@@ -39,6 +39,7 @@
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;height: 35px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">