Просмотр исходного кода

[统计][添加][增加导出待缴商户]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
f7bddbf386
2 измененных файлов: 5 добавлений и 2 удалений
  1. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Просмотреть файл

@@ -307,7 +307,7 @@ public class WxChartServiceImpl implements WxChartDataService {


//商铺出租率走势 //商铺出租率走势
if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) {
return getRentRateHistory(tenantId);
return getRentRateHistory(tenantId,paramsMap);
} }


return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN);
@@ -318,7 +318,9 @@ public class WxChartServiceImpl implements WxChartDataService {
* @param tenantId * @param tenantId
* @return * @return
*/ */
private ResultData getRentRateHistory(String tenantId) {
private ResultData getRentRateHistory(String tenantId,Map<String, String> paramsMap) {
Integer dateType = Integer.parseInt(paramsMap.get("dateType"));

Map<String, Object> datamap = new LinkedHashMap<>(); Map<String, Object> datamap = new LinkedHashMap<>();
datamap.put("2018/10","10%"); datamap.put("2018/10","10%");
datamap.put("2018/11","20%"); datamap.put("2018/11","20%");


+ 1
- 0
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -806,6 +806,7 @@
select c.*,wcc.target_ad targetAd,wcc.id couponChannelId from wx_coupon c inner join wx_coupon_channel wcc select c.*,wcc.target_ad targetAd,wcc.id couponChannelId from wx_coupon c inner join wx_coupon_channel wcc
on wcc.coupon_id = c.id on wcc.coupon_id = c.id
left join wx_coupon_merchant wc on wc.product_id = c.id where 1=1 left join wx_coupon_merchant wc on wc.product_id = c.id where 1=1
and c.remain_inventory>0
<if test="merchantId != null"> <if test="merchantId != null">
and wc.merchant_id=#{merchantId} and wc.merchant_id=#{merchantId}
</if> </if>


Загрузка…
Отмена
Сохранить