更新Bug

watero-common-tool/src/main/java/com/iamberry/wechat/tools/StrUtils.java

@@ -36,11 +36,14 @@ public class StrUtils {
 			case 36:res = "维修完成";break;
 			case 37:res = "机器无故障,待用户确认";break;
 			case 38:res = "机器故障,待用户确认";break;
+
 			case 20:res = "待翻新入库";break;
 			case 21:res = "已翻新入库";break;
 			case 22:res = "不能翻新，待报废";break;
 			case 23:res = "已报废回收";break;
+
 			case 40:res = "待完善信息";break;
+
 			case 24:res = "待确认是否付费翻新";break;
 			case 25:res = "待翻新(付费)";break;
 			case 26:res = "已翻新（付费）";break;

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

@@ -1467,7 +1467,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         List<ComplaintDetectInfo> complaintDetectInfoList = complaintDetectInfoMapper.listComplaintDetectByOrderId(complaintDetectInfo);
         if(complaintDetectInfoList != null && complaintDetectInfoList.size() > 0) {
             ComplaintDetectInfo cdinfo = complaintDetectInfoList.get(0);
-            if (5 == cdinfo.getDetectProcessingResults()) {
+            int state = cdinfo.getDetectState();
+            if (state == 32 || state == 33 || state == 36 || state == 39) {
                 isMachineRetuen = true;
             }
         }

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

@@ -136,6 +136,7 @@
       cs.signclosed_update_time,
       cs.signclosed_customer_desc,
       cs.signclosed_is_receiving,
+      cs.signclosed_is_use,
       cs.sendback_id,
       cs.signclosed_is_whetherLess,
       cs.signclosed_store_id,

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

@@ -1353,6 +1353,13 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                 salesOrder.setSalesPayType(5);
                                 break;
                             }
+                            case "FXG" : {
+                                // 放心购平台
+                                salesOrder.setSalesStoreId(148);
+                                salesOrder.setSalesCompanyId(1);
+                                salesOrder.setSalesPayType(5);
+                                break;
+                            }
                             case "KDT" : {
                                 // 有赞
                                 salesOrder.setSalesStoreId(35);

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

@@ -1037,6 +1037,7 @@
                                 <th width="250">签收产品</th>
                                 <th width="150">签收日期</th>
                                 <th width="150">签收图片</th>
+                                <th width="150">是否使用</th>
                                 <th width="100">备注</th>
                             </tr>
                             </thead>
@@ -1090,6 +1091,7 @@
                                         </#if>
 
                                     </td>
+                                    <td class="text-c" width="100"><#if (signclosed.signclosedIsUse)??>${(signclosed.signclosedIsUse==1)?string("未使用","已使用")}<#else>未知</#if></td>
                                     <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>
                                 </tr>
                                 </#list>