Browse Source

[积分][修改]:积分计算问题

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
cfb4e0af2e
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java View File

@@ -129,7 +129,7 @@ public class WxShop extends BaseEntity {
private String rent; private String rent;


@io.swagger.annotations.ApiModelProperty(value = "预置业态", name = "businessId") @io.swagger.annotations.ApiModelProperty(value = "预置业态", name = "businessId")
private Long businessId;
private Integer businessId;


@io.swagger.annotations.ApiModelProperty(value = "租金单位", name = "rentUnit") @io.swagger.annotations.ApiModelProperty(value = "租金单位", name = "rentUnit")
private Integer rentUnit; private Integer rentUnit;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -2631,7 +2631,7 @@ public class WxChartServiceImpl implements WxChartDataService {
query.setFloor(Long.valueOf(floor)); query.setFloor(Long.valueOf(floor));
} }
if (StringUtils.isNotEmpty(business)) { if (StringUtils.isNotEmpty(business)) {
query.setBusinessId(Long.valueOf(business));
query.setBusinessId(Integer.valueOf(business));
} }
query.setType(null); query.setType(null);
Long total = wxShopMapper.getCountByWxShop(query); Long total = wxShopMapper.getCountByWxShop(query);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java View File

@@ -493,7 +493,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
for (int i = 0; i < busRules.size(); i++) { for (int i = 0; i < busRules.size(); i++) {
JSONObject bus = (JSONObject) busRules.get(i); JSONObject bus = (JSONObject) busRules.get(i);
Integer businessId1 = bus.getInteger("businessId"); Integer businessId1 = bus.getInteger("businessId");
if (record.getBusinessId().equals(Long.valueOf(businessId1))) {
if (record.getBusinessId().equals(businessId1)) {
busRule = bus; busRule = bus;
} }
if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) {


Loading…
Cancel
Save