diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java index aa843bf37..676b5fc13 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -44,6 +44,7 @@ public class WxCouponSendController extends BaseController { if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); + wxCouponSend.setSortColumns(WxCouponSend.Field.CreateDate_DESC); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); for (WxCouponSend cs:page.getList()) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 2c3ec2672..95957d9ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -158,17 +158,17 @@ public class WxCouponSend implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") + ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,SendStartTime_ASC("`sendStartTime` ASC"),SendStartTime_DESC("`sendStartTime` DESC") - ,SendEndTime_ASC("`sendEndTime` ASC"),SendEndTime_DESC("`sendEndTime` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,SendStartTime_ASC("`send_start_time` ASC"),SendStartTime_DESC("`send_start_time` DESC") + ,SendEndTime_ASC("`send_end_time` ASC"),SendEndTime_DESC("`send_end_time` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; private String value; Field(String value){ @@ -202,6 +202,8 @@ public class WxCouponSend implements Serializable { sb.append(fields[k].toString()); } + this.sortColumns = sb.toString(); + } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index d04687d74..e54f563bc 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -52,7 +52,7 @@ and `create_time` = #{createTime} - and `create_time` >= #{startTime} + and `create_time` >= #{startTime} and `create_time` <= #{endTime} @@ -75,7 +75,7 @@ @@ -151,7 +151,7 @@ select COUNT(*) FROM wx_coupon_action_log where tenant_id = #{tenantId} and channel_type = #{channelType} - and channel_id <= #{channelId} + and channel_id = #{channelId}