# Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.javarelease_toaliyun_real
| @@ -42,7 +42,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); | |||||
| final PageInfo<Map<String, Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -127,7 +127,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); | |||||
| final PageInfo<Map<String, Object>> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -141,7 +141,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); | |||||
| wxShopService.exportShop(wxShop, request, response); | wxShopService.exportShop(wxShop, request, response); | ||||
| } | } | ||||
| @@ -154,7 +154,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); | |||||
| wxShopService.exportNotRentShop(wxShop, request, response); | wxShopService.exportNotRentShop(wxShop, request, response); | ||||
| } | } | ||||
| @@ -170,7 +170,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); | |||||
| final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -42,7 +42,7 @@ public class WxActivityController extends BaseController { | |||||
| wxActivity.setStatus(null); | wxActivity.setStatus(null); | ||||
| } | } | ||||
| wxActivity.setTenantId(getTenantId()); | wxActivity.setTenantId(getTenantId()); | ||||
| wxActivity.setSortColumns(WxActivity.Field.Id_DESC); | |||||
| wxActivity.setSortColumns(WxActivity.Field.CreateTime_DESC,WxActivity.Field.Id_DESC); | |||||
| final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); | final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -44,7 +44,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| wxActivityJoin = new WxActivityJoin(); | wxActivityJoin = new WxActivityJoin(); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | wxActivityJoin.setTenantId(getTenantId()); | ||||
| wxActivityJoin.setSortColumns(WxActivityJoin.Field.Id_DESC); | |||||
| wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC,WxActivityJoin.Field.Id_DESC); | |||||
| final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { | |||||
| wxCampaign.setStatus(null); | wxCampaign.setStatus(null); | ||||
| } | } | ||||
| wxCampaign.setTenantId(getTenantId()); | wxCampaign.setTenantId(getTenantId()); | ||||
| wxCampaign.setSortColumns(WxCampaign.Field.Id_DESC); | |||||
| wxCampaign.setSortColumns(WxCampaign.Field.CreateTime_DESC,WxCampaign.Field.Id_DESC); | |||||
| final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -46,7 +46,7 @@ public class WxCouponInjectController extends BaseController { | |||||
| couponInject.setStatus(null); | couponInject.setStatus(null); | ||||
| } | } | ||||
| couponInject.setTenantId(getTenantId()); | couponInject.setTenantId(getTenantId()); | ||||
| couponInject.setSortColumns(WxCouponInject.Field.Id_DESC); | |||||
| couponInject.setSortColumns(WxCouponInject.Field.CreateTime_DESC,WxCouponInject.Field.Id_DESC); | |||||
| final PageInfo<WxCouponInject> page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); | final PageInfo<WxCouponInject> page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -71,7 +71,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| } | } | ||||
| return wxCouponOrderService.detailAdminVo(couponOrderId); | return wxCouponOrderService.detailAdminVo(couponOrderId); | ||||
| } | } | ||||
| @ApiOperation(value = "退券退款", notes = "{\"couponOrderId\":\"string\"}") | @ApiOperation(value = "退券退款", notes = "{\"couponOrderId\":\"string\"}") | ||||
| @PostMapping("/refund") | @PostMapping("/refund") | ||||
| @SystemControllerLog(description = "券包-退券退款") | @SystemControllerLog(description = "券包-退券退款") | ||||
| @@ -63,7 +63,7 @@ public class WxOrderController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxOrderController::list"); | logger.debug("[" + getIpAddr() + "] WxOrderController::list"); | ||||
| if (null == wxOrder) wxOrder = new WxOrder(); | if (null == wxOrder) wxOrder = new WxOrder(); | ||||
| wxOrder.setTenantId(getTenantId()); | wxOrder.setTenantId(getTenantId()); | ||||
| wxOrder.setSortColumns(WxOrder.Field.Id_DESC); | |||||
| wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC,WxOrder.Field.Id_DESC); | |||||
| final PageInfo<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class WxBillPropertyController extends BaseController { | |||||
| wxBillProperty = new WxBillProperty(); | wxBillProperty = new WxBillProperty(); | ||||
| } | } | ||||
| wxBillProperty.setTenantId(getTenantId()); | wxBillProperty.setTenantId(getTenantId()); | ||||
| wxBillProperty.setSortColumns(WxBillProperty.Field.Id_DESC); | |||||
| wxBillProperty.setSortColumns(WxBillProperty.Field.Createtime_DESC,WxBillProperty.Field.Id_DESC); | |||||
| PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class WxBillRentController extends BaseController { | |||||
| wxBillRent = new WxBillRent(); | wxBillRent = new WxBillRent(); | ||||
| } | } | ||||
| wxBillRent.setTenantId(getTenantId()); | wxBillRent.setTenantId(getTenantId()); | ||||
| wxBillRent.setSortColumns(WxBillRent.Field.Id_DESC); | |||||
| wxBillRent.setSortColumns(WxBillRent.Field.Createtime_DESC,WxBillRent.Field.Id_DESC); | |||||
| final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -77,7 +77,7 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| userInfo.setTenantId(getTenantId()); | userInfo.setTenantId(getTenantId()); | ||||
| userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); | |||||
| userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); | |||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| MallUserRole r = new MallUserRole(); | MallUserRole r = new MallUserRole(); | ||||
| @@ -48,7 +48,7 @@ public class WxCreditHistoryController extends BaseController{ | |||||
| log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | ||||
| if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(getUserId()); | wxCreditHistory.setCUserId(getUserId()); | ||||
| wxCreditHistory.setSortColumns(WxCreditHistory.Field.Id_DESC); | |||||
| wxCreditHistory.setSortColumns(WxCreditHistory.Field.CreateDate_DESC,WxCreditHistory.Field.Id_DESC); | |||||
| final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| @Override | @Override | ||||
| public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | ||||
| if (null == wxCoupon) wxCoupon = new WxCoupon(); | if (null == wxCoupon) wxCoupon = new WxCoupon(); | ||||
| wxCoupon.setSortColumns(WxCoupon.Field.Id_DESC); | |||||
| wxCoupon.setSortColumns(WxCoupon.Field.CreateDate_DESC, WxCoupon.Field.Id_DESC); | |||||
| PageInfo<WxCoupon> page = null; | PageInfo<WxCoupon> page = null; | ||||
| if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) | if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) | ||||
| wxCoupon.setStatus(null); | wxCoupon.setStatus(null); | ||||
| @@ -74,7 +74,7 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | ||||
| userInfo.setTenantId(getTenantId()); | userInfo.setTenantId(getTenantId()); | ||||
| userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); | |||||
| userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); | |||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| MallUserRole r = new MallUserRole(); | MallUserRole r = new MallUserRole(); | ||||