售后流程优化

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

@@ -233,28 +233,29 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
             for (SignclosedProductInfo productInfo : sigInfo.getSignclosedProductInfoList()) {
                 ProductColor productColor = productMapper.getProduceColor(productInfo.getSignclosedProductColor());
                 Product product = productMapper.getProduce(productColor.getColorProductId());
-                if (product.getProductIsDetection() == 1) {
-                    for (int j = 0; j < productInfo.getProductNum(); j++) {
-                        //添加待检测信息
-                        //查询签收信息
-                        ComplaintDetectInfo detectInfo = new ComplaintDetectInfo();
-                        detectInfo.setProductId(productColor.getColorProductId());
-                        detectInfo.setProductColorId(productInfo.getSignclosedProductColor());
-                        detectInfo.setDetectProductNumber(product.getProductNumber());
-                        detectInfo.setDetectState(1);
-                        detectInfo.setCustomerId(sigInfo.getSignclosedCustomerId());
-                        detectInfo.setIsMaintenance(0);
-                        detectInfo.setDetectRenovation(0);
-                        detectInfo.setDetectProcessingResults(0);
-                        detectInfo.setSignclosedId(sigInfo.getSignclosedId());
-                        try {
-                            complaintDetectInfoMapper.insert(detectInfo);
-                        } catch (Exception e) {
-                            throw new RuntimeException("------------生成检测信息出错------------");
+                if(product.getProductIsDetection() != null){
+                    if (product.getProductIsDetection() == 1) {
+                        for (int j = 0; j < productInfo.getProductNum(); j++) {
+                            //添加待检测信息
+                            //查询签收信息
+                            ComplaintDetectInfo detectInfo = new ComplaintDetectInfo();
+                            detectInfo.setProductId(productColor.getColorProductId());
+                            detectInfo.setProductColorId(productInfo.getSignclosedProductColor());
+                            detectInfo.setDetectProductNumber(product.getProductNumber());
+                            detectInfo.setDetectState(1);
+                            detectInfo.setCustomerId(sigInfo.getSignclosedCustomerId());
+                            detectInfo.setIsMaintenance(0);
+                            detectInfo.setDetectRenovation(0);
+                            detectInfo.setDetectProcessingResults(0);
+                            detectInfo.setSignclosedId(sigInfo.getSignclosedId());
+                            try {
+                                complaintDetectInfoMapper.insert(detectInfo);
+                            } catch (Exception e) {
+                                throw new RuntimeException("------------生成检测信息出错------------");
+                            }
                         }
                     }
                 }
-
             }
         }
     }
@@ -432,6 +433,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
             sendbackInfo.setSendbackStatus(3);
             sendbackInfo.setSendbackLogisticsCompany(signclosedInfo.getSignclosedLogistics());
             sendbackInfo.setSendbackLogisticsNo(signclosedInfo.getSignclosedLogisticsNumber());
+            sendbackInfo.setSendbackSignTime(signclosedInfo.getSignclosedDate());
             customerInfoMapper.updateSendbackInfo(sendbackInfo);
         }
         //关联客诉/判断是否生成客诉信息

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

@@ -240,6 +240,9 @@
                     <strong>寄回信息</strong>
                 </div>
                 <div class="formControls col-12 col-sm-12">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>寄回状态</strong>
+                    </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-c1" name="sendbackStatuss" value="1">
                         <label for="tel-c1">未寄回</label>