[专题][修改][修改findbyid]

mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java

@@ -2234,7 +2234,7 @@ public class WxChartServiceImpl implements WxChartDataService {
      */
     private ResultData getIndexShopRentData(String tenantId, String startDateStr) {
         HashMap<String, Object> datamap = new HashMap<>();
-        Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd").getTime();
+        Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime();
         Date endDate = DateUtils.getLastDayForMonth(startDate);
         WxShop query = new WxShop();
         query.setTenantId(tenantId);
@@ -2283,7 +2283,7 @@ public class WxChartServiceImpl implements WxChartDataService {
      */
     private ResultData getBillReceRate(String tenantId, String startDateStr) {
         HashMap<String, Object> datamap = new HashMap<>();
-        Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd").getTime();
+        Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime();
         Date endDate = DateUtils.getLastDayForMonth(startDate);
 
         //租金收缴率
@@ -2430,7 +2430,7 @@ public class WxChartServiceImpl implements WxChartDataService {
         Date endDate = DateUtils.getDateFromString(enddate,"yyyy-MM-dd HH:mm:ss").getTime();
 
         HashMap<String, Object> datamap = new HashMap<>();
-        List<String> days = DateUtils.getTjTimeList(startdate,enddate,"0");
+        List<String> days = DateUtils.getTjTimeList(new SimpleDateFormat("yyyy-MM-dd").format(startDate),new SimpleDateFormat("yyyy-MM-dd").format(endDate),"0");
         TreeMap<String, Object> historyMap;
         Map<String, Integer> countMap;
         WxCoupon couponQuery = new WxCoupon();

mallinkService/src/main/resources/mapper/WxCouponMapper.xml

@@ -746,12 +746,6 @@
         and wop.create_date between #{startdate} and #{enddate}
     </select>
 
-    <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
-        select wc.*,wc.title as couponName,wc.`cover_img` as couponPic,wc.id as couponId from wx_coupon_channel ct left join
-		wx_coupon wc on wc.id = ct.coupon_id
-		where ct.`sub_target_id` = #{id}
-    </select>
-
     <select id="priceCouponCancelCount"  parameterType="com.iformall.domain.po.WxCoupon" resultType="Long">
         select count(c.id) from wx_coupon c
         left join wx_coupon_order wco on c.id = wco.coupon_id
@@ -770,4 +764,14 @@
         group by xtime
     </select>
 
+    <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
+       select ct.id as id,
+        wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
+        wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
+        wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
+        wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`
+        ,wc.title as couponName,wc.`cover_img` as couponPic,wc.id as couponId from wx_coupon_channel ct left join
+		wx_coupon wc on wc.id = ct.coupon_id
+		where ct.`sub_target_id` = #{id}
+    </select>
 </mapper>