Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 44c4f3279675a28d348c4d91c0db1df1d9e0ff32
+  newTag: 5046aa4b5db1f77c123165dfc3ea7bb0adabe47d

src/main/java/com/mmc/pms/service/impl/ProductServiceImpl.java

@@ -345,10 +345,18 @@ public class ProductServiceImpl implements ProductSkuService {
   }
 
   public int getDayRange(int day) {
-    if (between(day, 0 ,7)) return 0;
-    if (between(day, 8, 15)) return 1;
-    if (between(day, 16,30)) return 2;
-    if (day > 30) return 3;
+    if (between(day, 0 ,7)) {
+      return 0;
+    }
+    if (between(day, 8, 15)) {
+      return 1;
+    }
+    if (between(day, 16,30)) {
+      return 2;
+    }
+    if (day > 30) {
+      return 3;
+    }
 
     throw new RuntimeException("租期有误!");
   }

src/main/java/com/mmc/pms/service/lease/impl/LeaseGoodsServiceImpl.java

@@ -42,7 +42,9 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
     @Override
     public ResultBody addLeaseGoods(LeaseGoodsVO leaseGoodsVO, Integer userAccountId) {
         ResultBody resultError = mallGoodsService.checkInformation(leaseGoodsVO, null, userAccountId);
-        if (resultError != null) return resultError;
+        if (resultError != null) {
+            return resultError;
+        }
         int count = leaseGoodsDao.countLeaseGoodsByUserAccountId(userAccountId);
         LeaseGoodsDO leaseGoodsDO = new LeaseGoodsDO(leaseGoodsVO);
         leaseGoodsDO.setUserAccountId(userAccountId);

src/main/resources/not-check.yml

@@ -41,3 +41,4 @@ data-filter:
     - /pms/app/goods/recommend
     - /pms/brand/listBrandInfo
     - /pms/app/lease/leaseGoodsList
+    - /pms/lease/goods/getLeaseTermInfo