Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -271,6 +271,12 @@ public interface CustomerService {
     String  synchronizePostageInfo();
 
     /**
+     * 同步寄回信息
+     * @return
+     */
+    String  synchronizeSendbackInfo();
+
+    /**
      * 添加寄回信息
      */
     SendbackInfo addSendbackInfo(SendbackInfo sendbackInfo);

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

@@ -1615,6 +1615,54 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional
+    public String synchronizeSendbackInfo() {
+        List<CmRelation> cmRelationlist = cmRelationMapper.getCmRelationList(new CmRelation());
+        Integer num = 0;//成功个数
+        Integer oum = 0;//失败个数
+        try {
+            for (CmRelation cmRelation : cmRelationlist){
+                SendbackInfo sendbackInfo = new SendbackInfo();
+                sendbackInfo.setRelationId(cmRelation.getRelationId());
+                sendbackInfo.setSendbackLogisticsCompany(cmRelation.getRelationBackLogisticsCompany());
+                sendbackInfo.setSendbackLogisticsNo(cmRelation.getRelationBackLogisticsNo());
+                sendbackInfo.setSendbackName(cmRelation.getRelationBackName());
+                sendbackInfo.setSendbackTel(cmRelation.getRelationBackTel());
+                sendbackInfo.setSendbackStatus(cmRelation.getRelationBackStatus());
+                sendbackInfo.setSendbackSignTime(cmRelation.getRelationBackReceiptDate());
+                int s = customerInfoMapper.addSendbackInfo(sendbackInfo);
+                    if(s > 0){
+                        num++;
+                        ClosedProdcue closedProdcue = new ClosedProdcue();
+                        closedProdcue.setRelationId(cmRelation.getRelationId());
+                        List<ClosedProdcue> listClosedProdcue = closedProdcueMapper.listclosedProdcue(closedProdcue);
+
+                        List<SendbackItem> listSendbackItem = new ArrayList<>();
+                        for(ClosedProdcue prodcue : listClosedProdcue){
+                            SendbackItem sendbackItem = new SendbackItem();
+                            sendbackItem.setSendbackId(sendbackInfo.getSendbackId());
+                            sendbackItem.setSendbackProductId(prodcue.getProductId());
+                            sendbackItem.setSendbackColorId(prodcue.getColorId());
+                            sendbackItem.setSendbackProdcueNumber(prodcue.getClosedProdcueNumber());
+                            sendbackItem.setSendbackProdcueNumber(prodcue.getClosedProdcueNumber());
+                            listSendbackItem.add(sendbackItem);
+                        }
+                        if(listSendbackItem.size() > 0){
+                            customerInfoMapper.addSendbackItemList(listSendbackItem);
+                    }
+                }else{
+                        oum++;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("同步寄回信息失败");
+
+        }
+        return "同步成功:"+num+"个，失败："+oum+"个";
+    }
+
+    @Override
+    @Transactional
     public SendbackInfo addSendbackInfo(SendbackInfo sendbackInfo) {
         JSONArray jsonArray;
         List<SendbackItem> sendbackItemList;

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

@@ -278,7 +278,7 @@
     v.visit_complete_tel,
     sa.admin_name AS visitDesignatedAdminName,
     cq.question_profile,
-    cc.relationBackStatus AS backStatus,
+    sx.sendback_status AS backStatus,
     cc.relationSendStatus AS sendStatus,
     cc.relationSendLogisticsNo AS sendLogisticsNo,
     cc.relationSendLogisticsCompany AS sendLogisticsCompany,
@@ -324,6 +324,24 @@
         LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_cm_relation.relation_id
         ) xx
     ) cc ON cc.customerId = c.customer_id
+    LEFT JOIN (
+    SELECT
+    sxx.*
+    FROM
+    (
+    SELECT ss.* from (
+    select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
+    FROM
+    tb_rst_cm_sendback_info
+    LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
+
+    ORDER BY
+    sendback_create_time desc
+    ) ss
+    GROUP BY
+    ss.relation_id
+    ) sxx
+    ) sx ON sx.customer_id = c.customer_id
     LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
     LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id

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

@@ -2164,5 +2164,17 @@ public class AdminCustomerController {
            String msg = customerService.synchronizePostageInfo();
         return new ResponseJson(200, msg, 200);
     }
+    /**
+     * 同步寄回信息
+     * @param request
+     * @param
+     * @return
+     */
+    /*@ResponseBody
+    @RequestMapping("/synchronizeSendbackInfo")*/
+    public ResponseJson synchronizeSendbackInfo(HttpServletRequest request){
+           String msg = customerService.synchronizeSendbackInfo();
+        return new ResponseJson(200, msg, 200);
+    }
 }
 

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,8 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=watero_rst
-#jdbc.password=watero_RST
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=watero_rst
+jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
@@ -10,9 +10,9 @@ jdbc.driver=com.mysql.jdbc.Driver
 #jdbc.username=rst_test
 #jdbc.password=RST_test
 
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=rst_test
-jdbc.password=RST_test
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=rst_test
+#jdbc.password=RST_test
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
 #jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull

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

@@ -145,7 +145,7 @@
             <th width="80">购买日期</th>
             <th width="60">区域</th>
             <th width="60">TDS</th>
-            <th width="80">物流单号</th>
+            <#--<th width="80">物流单号</th>-->
             <th width="80">处理结果</th>
             <#--<th width="80">需要回访</th>-->
             <th width="80">客诉时间</th>
@@ -210,7 +210,7 @@
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <td>${customer.customerArea!''}</td>
                             <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
-                            <td>
+                            <#--<td>
                                 <#if (customer.sendLogisticsNo??) || (customer.backLogisticsNo??)>
 
                                         <#if (customer.backLogisticsNo??)>
@@ -224,7 +224,7 @@
                                 <#else>
                                     无
                                 </#if>
-                            </td>
+                            </td>-->
                             <td id="txt_customerIsSolve">
                                 <#if customer.procMethodIsBack?? && customer.procMethodIsSend??>
                                     <#if customer.procMethodIsBack == 1 || customer.procMethodIsSend == 1>