diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 0ae1743cd..22d31b5c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2294,12 +2294,6 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - public static void main(String[] args) { - double a = 0.0; - System.out.println(a==0.0); - System.out.println(); - } - /** * 费用收缴数据 * @param tenantId @@ -2445,6 +2439,15 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + public static void main(String[] args) { + BigDecimal receivepay = new BigDecimal(33); + BigDecimal pay = new BigDecimal(11); + BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_UNNECESSARY); + System.out.println(divide); + double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + System.out.println(zjcjl); + } + /** * 营销数据 * @param tenantId diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 90fcd493a..44efa7e0f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -509,21 +509,21 @@ left join wx_coupon c on c.id = ci.coupon_id left join wx_coupon_order co on co.id = ci.id where c.type = 100 - and c.create_date between #{startdate} and #{enddate} + and co.create_date between #{startdate} and #{enddate} @@ -760,7 +760,7 @@ left join wx_coupon c on c.id = ci.coupon_id left join wx_coupon_order co on co.id = ci.id where c.type = 100 - and c.create_date between #{startdate} and #{enddate} + and co.create_date between #{startdate} and #{enddate} group by xtime