更新系统

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

@@ -1189,8 +1189,10 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             JSONObject logistics = logisticsArray.getJSONObject(0);
             String companyCode = logistics.getString("companyCode");
             String deliveryNo = logistics.getString("deliveryNo");
-            String deliveryTime = logistics.getString("deliveryTime");
-            salesOrder.setSalesDeliverTime(sdf.parse(deliveryTime));
+            if (logistics.has("deliveryTime")) {
+                String deliveryTime = logistics.getString("deliveryTime");
+                salesOrder.setSalesDeliverTime(sdf.parse(deliveryTime));
+            }
             switch (companyCode){
                 case "2087":{
                     salesOrder.setSalesPostFirm("jd");

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

@@ -1259,22 +1259,14 @@
                                         <input type="radio" id="tel-001" name="detectProcessingResults_1" checked value="31">
                                         <label for="tel-001">付费维修</label>
                                     </div>
-                                    <#--<div class="radio-box" id="updateDetect_1_1">
-                                        <input type="radio" id="tel-002" name="detectProcessingResults_1" value="2">
-                                        <label for="tel-002">免费维修</label>
-                                    </div>
-                                    <div class="radio-box" >
-                                        <input type="radio" id="tel-003" name="detectProcessingResults_1" value="3">
-                                        <label for="tel-003">退货处理</label>
-                                    </div>
-                                    <div class="radio-box">
-                                        <input type="radio" id="tel-004" name="detectProcessingResults_1" value="4">
-                                        <label for="tel-004">换货处理</label>
-                                    </div>-->
                                     <div class="radio-box">
                                         <input type="radio" id="tel-005" name="detectProcessingResults_1" value="33">
                                         <label for="tel-005">原机退回</label>
                                     </div>
+                                    <div class="radio-box">
+                                        <input type="radio" id="tel-007" name="detectProcessingResults_1" value="25">
+                                        <label for="tel-007">翻新(付费)</label>
+                                    </div>
                                 </div>
                         </div>
                             <div class="row cl" id="updateDetect_2" style="display: none;">
@@ -3657,6 +3649,12 @@
         procMethod(3);
         $("#procMethodId").val(32);
     });
+    $("#tel-007").click(function (){
+        $("#updateDetect_3").show();
+        $("#procTypeId").val(2);//回显客诉处理方式
+        procMethod(2);
+        $("#procMethodId").val(30);
+    });
 
 
    $(function () {