From 260d6ee827cb9e60cf8daa3325e16520b200894d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 30 Jun 2019 03:41:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8E=92=E5=BA=8F][=E4=BF=AE=E6=94=B9]:id?= =?UTF-8?q?=E7=94=B119=E4=BD=8D=E5=8F=98=E4=B8=BA18=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=AE=97=E6=B3=95=E5=81=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20#=20Conflicts:=20#=09mallinkAdmin/src/main/java/com/iformall?= =?UTF-8?q?/controller/market/WxCouponOrderController.java=20#=09mallinkAd?= =?UTF-8?q?min/src/main/java/com/iformall/controller/rent/WxBillPropertyCo?= =?UTF-8?q?ntroller.java=20#=09mallinkAdmin/src/main/java/com/iformall/con?= =?UTF-8?q?troller/rent/WxBillRentController.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/basic/WxShopController.java | 10 +++++----- .../controller/market/WxActivityController.java | 2 +- .../controller/market/WxActivityJoinController.java | 2 +- .../controller/market/WxCampaignController.java | 2 +- .../controller/market/WxCouponInjectController.java | 2 +- .../controller/market/WxCouponOrderController.java | 2 +- .../iformall/controller/market/WxOrderController.java | 2 +- .../controller/rent/WxBillPropertyController.java | 2 +- .../iformall/controller/rent/WxBillRentController.java | 2 +- .../controller/sys/MallUserInfoController.java | 2 +- .../iformall/controller/WxCreditHistoryController.java | 2 +- .../com/iformall/service/impl/WxCouponServiceImpl.java | 2 +- .../controller/sys/MallUserInfoController.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 51b059586..29590c7a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -42,7 +42,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); @@ -127,7 +127,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); final PageInfo> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); return new ResultData(page); } @@ -141,7 +141,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); wxShopService.exportShop(wxShop, request, response); } @@ -154,7 +154,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); wxShopService.exportNotRentShop(wxShop, request, response); } @@ -170,7 +170,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index 25ca595ab..0e8cac415 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -42,7 +42,7 @@ public class WxActivityController extends BaseController { wxActivity.setStatus(null); } wxActivity.setTenantId(getTenantId()); - wxActivity.setSortColumns(WxActivity.Field.Id_DESC); + wxActivity.setSortColumns(WxActivity.Field.CreateTime_DESC,WxActivity.Field.Id_DESC); final PageInfo page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 55e51f15e..90bdd851e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -44,7 +44,7 @@ public class WxActivityJoinController extends BaseController { wxActivityJoin = new WxActivityJoin(); } wxActivityJoin.setTenantId(getTenantId()); - wxActivityJoin.setSortColumns(WxActivityJoin.Field.Id_DESC); + wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC,WxActivityJoin.Field.Id_DESC); final PageInfo page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 265e94309..b366caee6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(null); } wxCampaign.setTenantId(getTenantId()); - wxCampaign.setSortColumns(WxCampaign.Field.Id_DESC); + wxCampaign.setSortColumns(WxCampaign.Field.CreateTime_DESC,WxCampaign.Field.Id_DESC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index b01369437..1fd94c458 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -46,7 +46,7 @@ public class WxCouponInjectController extends BaseController { couponInject.setStatus(null); } couponInject.setTenantId(getTenantId()); - couponInject.setSortColumns(WxCouponInject.Field.Id_DESC); + couponInject.setSortColumns(WxCouponInject.Field.CreateTime_DESC,WxCouponInject.Field.Id_DESC); final PageInfo page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 56e6a0b9b..9b233ac57 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -71,7 +71,7 @@ public class WxCouponOrderController extends BaseController { } return wxCouponOrderService.detailAdminVo(couponOrderId); } - + @ApiOperation(value = "退券退款", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("/refund") @SystemControllerLog(description = "券包-退券退款") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index f43aab28e..14c9abdb6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -63,7 +63,7 @@ public class WxOrderController extends BaseController { logger.debug("[" + getIpAddr() + "] WxOrderController::list"); if (null == wxOrder) wxOrder = new WxOrder(); wxOrder.setTenantId(getTenantId()); - wxOrder.setSortColumns(WxOrder.Field.Id_DESC); + wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC,WxOrder.Field.Id_DESC); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index e997d58ae..46279133e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -39,7 +39,7 @@ public class WxBillPropertyController extends BaseController { wxBillProperty = new WxBillProperty(); } wxBillProperty.setTenantId(getTenantId()); - wxBillProperty.setSortColumns(WxBillProperty.Field.Id_DESC); + wxBillProperty.setSortColumns(WxBillProperty.Field.Createtime_DESC,WxBillProperty.Field.Id_DESC); PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 582be2681..e48209faa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -39,7 +39,7 @@ public class WxBillRentController extends BaseController { wxBillRent = new WxBillRent(); } wxBillRent.setTenantId(getTenantId()); - wxBillRent.setSortColumns(WxBillRent.Field.Id_DESC); + wxBillRent.setSortColumns(WxBillRent.Field.Createtime_DESC,WxBillRent.Field.Id_DESC); final PageInfo page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 6cf41b2db..73cb04a5b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -77,7 +77,7 @@ public class MallUserInfoController extends BaseController { } userInfo.setTenantId(getTenantId()); - userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); + userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { MallUserRole r = new MallUserRole(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 2fc49f991..28947e1bd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -48,7 +48,7 @@ public class WxCreditHistoryController extends BaseController{ log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(getUserId()); - wxCreditHistory.setSortColumns(WxCreditHistory.Field.Id_DESC); + wxCreditHistory.setSortColumns(WxCreditHistory.Field.CreateDate_DESC,WxCreditHistory.Field.Id_DESC); final PageInfo page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 1792b5b10..abd3ea428 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -65,7 +65,7 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); - wxCoupon.setSortColumns(WxCoupon.Field.Id_DESC); + wxCoupon.setSortColumns(WxCoupon.Field.CreateDate_DESC, WxCoupon.Field.Id_DESC); PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 392431618..eca16d488 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -74,7 +74,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); userInfo.setTenantId(getTenantId()); - userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); + userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { MallUserRole r = new MallUserRole();