Browse Source

fix 优化

release_toaliyun_real
winter 4 years ago
parent
commit
576f85576f
2 changed files with 3 additions and 19 deletions
  1. +3
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  2. +0
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

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

@@ -1579,12 +1579,7 @@ public class WxChartServiceImpl implements WxChartDataService {
c.add(Calendar.DAY_OF_YEAR, -7); c.add(Calendar.DAY_OF_YEAR, -7);
Date sTime = c.getTime(); Date sTime = c.getTime();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
//TOOD 待优化
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
List<CUserDateAmountVo> datas = null;
if (true) {
return new ResultData();
}
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
Map<String, Integer> dataMap = new HashMap<>(); Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) { for (CUserDateAmountVo v : datas) {
dataMap.put(v.getXTime(), v.getPrice()); dataMap.put(v.getXTime(), v.getPrice());
@@ -1626,12 +1621,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date eTime = c.getTime();//明天0点 Date eTime = c.getTime();//明天0点
c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
//TODO 待优化数据
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
List<CUserDateAmountVo> datas = null;
if (true ) {
return new ResultData();
}
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额 List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额
Map<String, Integer> dataMap = new HashMap<>(); Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) { for (CUserDateAmountVo v : datas) {
@@ -1770,12 +1760,7 @@ public class WxChartServiceImpl implements WxChartDataService {
c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前
Date sTime = c.getTime(); Date sTime = c.getTime();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
//TODO 待优化数据
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
List<CUserDateAmountVo> datas = null;
if(true) {
return new ResultData();
}
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
Map<String, Integer> dataMap = new HashMap<>(); Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) { for (CUserDateAmountVo v : datas) {
dataMap.put(v.getXTime(), v.getPrice()); dataMap.put(v.getXTime(), v.getPrice());


+ 0
- 1
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -671,7 +671,6 @@
GROUP BY xTime GROUP BY xTime
</select> </select>



<select id="findExpiredFreeCouponOrderByValidDate" parameterType="String" resultMap="BaseResultMap"> <select id="findExpiredFreeCouponOrderByValidDate" parameterType="String" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_coupon_order select <include refid="allColumns" /> from wx_coupon_order
where tenant_id = #{tenantId} and expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price = 0 and coupon_order_status in (0, 4) where tenant_id = #{tenantId} and expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price = 0 and coupon_order_status in (0, 4)


Loading…
Cancel
Save