From 85a1131a9081d78f323e3662c14748ec1ec5eadb Mon Sep 17 00:00:00 2001
From: gongbiao <gongbiao>
Date: Fri, 19 Apr 2019 16:34:58 +0800
Subject: [PATCH] =?UTF-8?q?[BUG][ID1001319][dev=20version:.925.1358?=
 =?UTF-8?q?=EF=BC=9A=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86-=E8=A1=A5?=
 =?UTF-8?q?=E5=BD=95/=E6=96=B0=E5=BB=BA=E7=94=9F=E4=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E9=93=BA=E5=8F=B7=EF=BC=88=E6=8C=89=E8=AE=A1=E7=A7=9F=E6=9C=88?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=89]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxRentContractServiceImpl.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index 0ad67c9f7..8654bf6b4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -98,11 +98,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
     @Autowired
     WxMerchantShopMapper wxMerchantShopMapper;
 
-    public static void main(String[] args) {
-        System.out.println(3%3);
-        System.out.println(6%3);
-    }
-
     @Override
     public Map<String, Object> listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) {
         Object rentContractStatusInfo = getRentContractStatusInfo(record);
@@ -767,6 +762,17 @@ public class WxRentContractServiceImpl implements WxRentContractService {
                 priceArrs[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).intValue();
             }
         }
+        if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) &&
+                wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
+            String rentInfo = wxRentContract.getRentInfo();
+            JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
+            for (int i = 0; i < size; i++) {
+                Map<String, Object> shopInfo = new HashMap<>();
+                JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
+                shopInfo.put(rentInfoObject.getString("shopNumber"), 0);
+                shopInfos.add(shopInfo);
+            }
+        }
 
         int month = 12;
         int divide = lease / month;