Przeglądaj źródła

[图表整合][修改][判断]

release_toaliyun_real
gongbiao 7 lat temu
rodzic
commit
5b5d6444ae
4 zmienionych plików z 1389 dodań i 8 usunięć
  1. +2
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillTypeParam.java
  3. +1384
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml

+ 2
- 4
mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java Wyświetl plik

@@ -141,7 +141,7 @@ public class ChartDataSchedule {
if (count == 0) {
logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>");
Integer price = wxCouponOrderMapper.queryPriceTotal(tenantId, startdate, enddate);
addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), enddate, createtime);
addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime);
}
}
}
@@ -153,8 +153,6 @@ public class ChartDataSchedule {
HashMap<String, Object> params = new HashMap<>();
Date createtime = new Date();
String yesterday = DateUtils.getTimeBefore(1, createtime);
String today = DateUtils.getSystemTime("yyyy-MM-dd");
Date enddate = DateUtils.stringToDate(today);
Date querytime = DateUtils.stringToDate(yesterday);

WxChartDataEntity wxChartDataEntity = new WxChartDataEntity();
@@ -178,7 +176,7 @@ public class ChartDataSchedule {
if (!recordList.isEmpty()) {
price = recordList.get(0).getTradeAmt();
}
addChartData(tenantId, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), enddate, createtime);
addChartData(tenantId, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime);
}
}
}


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumBillTypeParam.java Wyświetl plik

@@ -13,7 +13,8 @@ public enum EnumBillTypeParam {
PROPERTY_DEPOSIT(4,"物业押金"),
WATER(5, "水费"),
POWER(6, "电费"),
ROUTINE(7,"其他")
ROUTINE(7, "其他费用"),
ATHER_DEPOSIT(8, "其他押金")
;

public static EnumBillTypeParam getEnum(Integer code) {


+ 1384
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
Plik diff jest za duży
Wyświetl plik


+ 1
- 1
mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml Wyświetl plik

@@ -84,7 +84,7 @@
and o.id=#{id}
</if>
and o.order_group_id!=0
order by o.id desc,o.order_status
order by o.id,o.order_status
</select>



Ładowanie…
Anuluj
Zapisz