增加售后规则查看功能

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1419,7 +1419,7 @@ public class AdminSalesOrderController {
             dateReceipt = salesOrder.getSalesSalesTime();
         }else{
             //通过快递100获取签收时间
-            if(!StringUtils.isEmpty(salesOrder.getSalesPostFirm()) && !StringUtils.isEmpty(salesOrder.getSalesPostNum())) {
+            /*if(!StringUtils.isEmpty(salesOrder.getSalesPostFirm()) && !StringUtils.isEmpty(salesOrder.getSalesPostNum())) {*/
                 JSONObject rst = kuaidi100.getExpressInfo(salesOrder.getSalesPostFirm(), salesOrder.getSalesPostNum());
                 if (rst.has("state") && rst.getInt("state") == 3) {    //当快递状态为已签收的时候
                     JSONArray JSONArray = rst.getJSONArray("data");
@@ -1439,22 +1439,24 @@ public class AdminSalesOrderController {
                     rightNow.add(Calendar.DAY_OF_YEAR,3);
                     dateReceipt = rightNow.getTime();
                 }
-            }
+            /*}*/
         }
         //判断是否符合售后条件
         //当前时间减去签收时间获取使用天数
         long signTime = new Date().getTime() - dateReceipt.getTime();
-        long useTime = diff / (24 * 60 * 60 * 1000);
+        long useTime = signTime / (24 * 60 * 60 * 1000);
         Integer state;
         Integer end;
         //是否符合无理由退货
         JSONObject returnReason = JSONObject.fromObject(afterrulesInfo.getReturnReason());
         state = returnReason.getInt("state");
         end = returnReason.getInt("end");
-        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+        if(state+end == 0){
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime > state && useTime < end){
+        if(useTime >= state && useTime < end){
             afterrulesInfo.setIsReturnReason(1);
         }else{
             afterrulesInfo.setIsReturnReason(2);
@@ -1463,10 +1465,12 @@ public class AdminSalesOrderController {
         JSONObject qualityPeriod = JSONObject.fromObject(afterrulesInfo.getQualityPeriod());
         state = qualityPeriod.getInt("state");
         end = qualityPeriod.getInt("end");
-        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+        if(state+end == 0){
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime > state && useTime < end){
+        if(useTime >= state && useTime < end){
             afterrulesInfo.setIsQualityPeriod(1);
         }else{
             afterrulesInfo.setIsQualityPeriod(2);
@@ -1475,10 +1479,12 @@ public class AdminSalesOrderController {
         JSONObject warrantyProblem = JSONObject.fromObject(afterrulesInfo.getWarrantyProblem());
         state = warrantyProblem.getInt("state");
         end = warrantyProblem.getInt("end");
-        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+        if(state+end == 0){
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime > state && useTime < end){
+        if(useTime >= state && useTime < end){
             afterrulesInfo.setIsWarrantyProblem(1);
         }else{
             afterrulesInfo.setIsWarrantyProblem(2);
@@ -1487,10 +1493,12 @@ public class AdminSalesOrderController {
         JSONObject governancePeriod = JSONObject.fromObject(afterrulesInfo.getGovernancePeriod());
         state = governancePeriod.getInt("state");
         end = governancePeriod.getInt("end");
-        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+        if(state+end == 0){
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime > state && useTime < end){
+        if(useTime >= state && useTime < end){
             afterrulesInfo.setIsGovernancePeriod(1);
         }else{
             afterrulesInfo.setIsGovernancePeriod(2);
@@ -1499,10 +1507,12 @@ public class AdminSalesOrderController {
         JSONObject payRepair = JSONObject.fromObject(afterrulesInfo.getPayRepair());
         state = payRepair.getInt("state");
         end = payRepair.getInt("end");
-        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+        if(state+end == 0){
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime > state && useTime < end){
+        if(useTime >= state && useTime < end){
             afterrulesInfo.setIsPayRepair(1);
         }else{
             afterrulesInfo.setIsPayRepair(2);

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

@@ -52,21 +52,39 @@ public class KuaiDi100 {
           case "sto":
               code = "shentong";
               break;
+          case "STO":
+              code = "shentong";
+              break;
           case "yto":
               code = "yuantong";
               break;
+          case "YTO":
+              code = "yuantong";
+              break;
           case "sf":
               code = "shunfeng";
               break;
+          case "SF":
+              code = "shunfeng";
+              break;
           case "ems":
               code = "ems";
               break;
+          case "EMS":
+              code = "ems";
+              break;
           case "eyb":
               code = "ems";
               break;
+          case "EYB":
+              code = "ems";
+              break;
           case "zto":
               code = "zhongtong";
               break;
+          case "ZTO":
+              code = "zhongtong";
+              break;
           case "zjs":
               code = "zhaijisong";
               break;