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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

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

@@ -39,6 +39,13 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     Integer updateSignclosedById(ComplaintSignclosedInfo record);
+
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
+
     /**
      * 增加催促次数
      * @return

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

@@ -222,6 +222,11 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     }
 
     @Override
+    public Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.updateSignclosedByCustomerId(record);
+    }
+
+    @Override
     public int updateUrgedNumById(ComplaintSignclosedInfo complaintSignclosedInfo) {
         return complaintSignclosedInfoMapper.updateUrgedNumById(complaintSignclosedInfo);
     }

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

@@ -25,6 +25,12 @@ public interface ComplaintSignclosedInfoMapper {
     int updateSignclosedById(ComplaintSignclosedInfo record);
 
     /**
+     * 修改单个签收记录
+     * @return
+     */
+    int updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
+
+    /**
      * 增加催促次数
      * @return
      */

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

@@ -262,7 +262,73 @@
         signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
+      where
+          signclosed_id = #{signclosedId,jdbcType=INTEGER}
+  </update>
+
+  <update id="updateSignclosedByCustomerId" parameterType="ComplaintSignclosedInfo" >
+    update tb_rst_complaint_signclosed
+    <set >
+      <if test="signclosedType != null" >
+        signclosed_type = #{signclosedType,jdbcType=BIT},
+      </if>
+      <if test="signclosedTypeName != null" >
+        signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogistics != null" >
+        signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogisticsNumber != null" >
+        signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendName != null" >
+        signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendTel != null" >
+        signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrProvinces != null" >
+        signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedAddrCity != null" >
+        signclosed_addr_city = #{signclosedAddrCity,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedIsFittings != null" >
+        signclosed_is_fittings = #{signclosedIsFittings,jdbcType=BIT},
+      </if>
+      <if test="signclosedDate != null" >
+        signclosed_date = #{signclosedDate,jdbcType=DATE},
+      </if>
+      <if test="signclosedIsQuality != null" >
+        signclosed_is_quality = #{signclosedIsQuality,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedIsInto != null" >
+        signclosed_is_into = #{signclosedIsInto,jdbcType=BIT},
+      </if>
+      <if test="signclosedState != null" >
+        signclosed_state = #{signclosedState,jdbcType=BIT},
+      </if>
+      <if test="signclosedObjectsState != null" >
+        signclosed_objects_state = #{signclosedObjectsState,jdbcType=BIT},
+      </if>
+      <if test="signclosedUrgedNum != null" >
+        signclosed_urged_num = #{signclosedUrgedNum,jdbcType=INTEGER},
+      </if>
+      <if test="oldEfastId != null" >
+        old_efast_id = #{oldEfastId,jdbcType=VARCHAR},
+      </if>
+      <if test="newEfastId != null" >
+        new_efast_id = #{newEfastId,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedCustomerDesc != null" >
+        signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedDesc != null" >
+        signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where
+        signclosed_customer_id = #{signclosedCustomerId},
   </update>
 
   <update id="updateUrgedNumById" parameterType="ComplaintSignclosedInfo" >

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

@@ -84,6 +84,9 @@
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
       </if>
+      <if test="customerIsSolve != null">
+        AND c.customer_is_solve = #{customerIsSolve}
+      </if>
       <if test="customerTel != null and customerTel != ''">
         and c.customer_tel like CONCAT('%',#{customerTel},'%')
       </if>

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

@@ -78,6 +78,8 @@ public class AdminCustomerController {
     private ComplaintQuestionInfoService complaintQuestionInfoService;
     @Autowired
     private SmsService smsService;
+    @Autowired
+    private ComplaintSignclosedInfoService complaintSignclosedInfoService;
 
 
     /**
@@ -971,6 +973,14 @@ public class AdminCustomerController {
         if (StringUtils.isNotEmpty(mergeAddress)) {
             renewed.setRenewedSendMergeAddress(mergeAddress);
         }
+
+        if(renewed.getRenewedBackStatus() != 1){
+            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedLogistics(renewed.getRenewedBackLogisticsCompany());
+            cs.setSignclosedLogisticsNumber(renewed.getRenewedBackLogisticsNo());
+            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+        }
+
         //修改换新信息
         int num = renewedService.updateRenewedInfo(renewed, closedProducts, closedFittings);
         if (num > 0) {
@@ -1074,8 +1084,16 @@ public class AdminCustomerController {
             return new ResponseJson(500, "该efast订单号无效，请重新输入!", 500);
         }*/
 
+        if(repair.getRepairBackStatus() != 1){
+            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedLogistics(repair.getRepairBackLogisticsCompany());
+            cs.setSignclosedLogisticsNumber(repair.getRepairBackLogisticsNo());
+            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+        }
+
         //修改维修信息
         int num = repairService.updateRepairInfo(repair, closedProducts, closedFittings);
+
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);
         } else {
@@ -1148,6 +1166,13 @@ public class AdminCustomerController {
 //            backGoods.setBackGoodsBackPostage(backGoods.getBackGoodsBackPostage().intValue() * 100);
 //        }
 
+        if(backGoods.getBackGoodsBackStatus() != 1){
+            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedLogistics(backGoods.getBackGoodsBackLogisticsCompany());
+            cs.setSignclosedLogisticsNumber(backGoods.getBackGoodsBackLogisticsNo());
+            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+        }
+
         int num = backGoodsService.updateBackGoods(backGoods, closedProducts, closedFittings);
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);
@@ -1304,6 +1329,14 @@ public class AdminCustomerController {
 //        if (StringUtils.isNotEmpty(noreasonBack.getNoreasonBackBackPostage().toString())) {
 //            noreasonBack.setNoreasonBackBackPostage(noreasonBack.getNoreasonBackBackPostage().intValue() * 100);
 //        }
+
+        if(noreasonBack.getNoreasonBackBackStatus() != 1){
+            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedLogistics(noreasonBack.getNoreasonBackBackLogisticsCompany());
+            cs.setSignclosedLogisticsNumber(noreasonBack.getNoreasonBackBackLogisticsNo());
+            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+        }
+
         int num = noreasonBackService.updateNoreasonBack(noreasonBack, closedProducts, closedFittings);
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -385,30 +385,47 @@ public class ExcelUtil {
         while (rows.hasNext()) {
             Row temp = rows.next();
             try {
-                EfastOrder order = new EfastOrder();
-                order.setOrderAddressName(getValue(temp.getCell(nameColumnIndex)));                                 // 读取name
-
-                //读取平台id
-                //order.setPlatformOrderId(getValue(temp.getCell(platformOrderColumnIndex)).trim());
-                Cell ce = temp.getCell(platformOrderColumnIndex);
-                String platformOrderId = String.valueOf(getExcelCell(ce)).trim();
-                order.setPlatformOrderId(platformOrderId);
 
+                String nameValue = getValue(temp.getCell(nameColumnIndex));  // 读取name
+                String platformOrderIdValue = getValue(temp.getCell(platformOrderColumnIndex));  // 读取平台id
                 //获取手机号码
+                //String userTel = getValue(temp.getCell(telColumnIndex)).trim();   // 读取tel
                 Cell telCell = temp.getCell(telColumnIndex);
-                String userTel = String.valueOf(getExcelCell(telCell)).trim();
+                String userTel = String.valueOf(getExcelCell(telCell));
-                //String userTel = getValue(temp.getCell(telColumnIndex)).trim();
+                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex))); // 读取对应的产品id
+
+                if(StringUtils.isEmpty(nameValue) && StringUtils.isEmpty(userTel) && StringUtils.isEmpty(OrderProductBarCodeValue)){
+                    break;
+                }
+
+                EfastOrder order = new EfastOrder();
+                order.setOrderAddressName(nameValue);
+                if(!StringUtils.isEmpty(platformOrderIdValue)){
+                    order.setPlatformOrderId(platformOrderIdValue.trim());
+                }else{
+                    order.setPlatformOrderId("1");
+                }
+
                 // 如果手机号码校验不通过，则应该不录入
-                if (!ValidateUtil.checkMobile(userTel)) {
+                if (!ValidateUtil.checkMobile(userTel.trim())) {
                     //temp.getCell(telColumnIndex).setCellStyle(cellStyle);
                     order.setReturnStatus("error");
                     order.setReturnMsg("手机号码不正确");
                     //continue;
                 }
-                order.setOrderAddressTel(userTel);                                                         // 读取tel
+                order.setOrderAddressTel(userTel.trim());
-                order.setOrderProductBarCode(map.get(getValue(temp.getCell(productColumnIndex))));         // 读取对应的产品id
+
-                order.setOrderNum(Integer.parseInt(getValue(temp.getCell(numColumnIndex))));               // 读取购买数量
+                order.setOrderProductBarCode(OrderProductBarCodeValue);
-                if (infoColumnIndex.length == 1) {
+                String orderNum = getValue(temp.getCell(numColumnIndex));
+                if(orderNum == null || "".equals(orderNum)){
+                    order.setReturnStatus("error");
+                    order.setReturnMsg("数量不正确");
+                    order.setOrderNum(0);               // 读取购买数量
+                }else{
+                    order.setOrderNum(Integer.valueOf(orderNum));               // 读取购买数量
+                }
+
+                if (infoColumnIndex.length == 1){
                     // 如果infoColumnIndex = 1, 则表示需要截取（可能是-、“ ”）
                     Cell cell = temp.getCell(infoColumnIndex[0]);
                     String addrInfo = getValue(cell);

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

@@ -40,7 +40,20 @@
             <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.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">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">
+
+            <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
+
+            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
+                <option value="">处理结果</option>
+                <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
+                <option value="2" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 2 >selected="selected"</#if></#if>>未解决</option>
+                <option value="3" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 3 >selected="selected"</#if></#if>>换新</option>
+                <option value="4" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 4 >selected="selected"</#if></#if>>维修</option>
+                <option value="5" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 5 >selected="selected"</#if></#if>>补发</option>
+                <option value="6" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 6 >selected="selected"</#if></#if>>退货</option>
+                <option value="7" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 7 >selected="selected"</#if></#if>>无理由退货</option>
+            </select>
+
             <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
                 <option value="">来源</option>
                 <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 1 >selected="selected"</#if></#if>>400电话</option>

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

@@ -35,6 +35,7 @@
                 <span id="backGoodsSchedule" class="c-red"></span>
             </div>
         </div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>

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

@@ -34,6 +34,7 @@
                 <span id="noreasonBackSchedule" class="c-red"></span>
             </div>
         </div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>

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

@@ -33,6 +33,7 @@
                 <span id="reissueSchedule" class="c-red"></span>
             </div>
         </div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>

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

@@ -33,6 +33,7 @@
                 <span id="renewedSchedule" class="c-red"></span>
             </div>
         </div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>

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

@@ -33,6 +33,9 @@
                 <span id="repairSchedule" class="c-red"></span>
             </div>
         </div>
+
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
+
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>