diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java index 167c021dd..b3d9055ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java @@ -784,6 +784,10 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { JsonArray notification = attribute.getAsJsonArray("notification"); map.put("notification",notification.toString()); map.put("order_limit", GsonHelper.getString(attribute, "order_limit")); + //售卖有效期 + map.put("groupon_valid_start", GsonHelper.getString(attribute, "groupon_valid_start")); + map.put("groupon_valid_end", GsonHelper.getString(attribute, "groupon_valid_end")); + //卷有效期 map.put("order_valid_start", GsonHelper.getString(attribute, "order_valid_start")); map.put("order_valid_end", GsonHelper.getString(attribute, "order_valid_end")); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 373aee7d6..c5c773e35 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -778,7 +778,7 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where c.type in (1,2,3,4,5,6,10,50,51) and o.order_status in(0,1,2,3,4,5) + where c.type in (1,2,3,4,5,6,10,50,51,66) and o.order_status in(0,1,2,3,4,5) and o.`tenant_id` = #{tenantId}