Explorar el Código

[代码][调整]:删除冗余的排序代码

release_toaliyun_real
hupeng hace 6 años
padre
commit
32d3084d93
Se han modificado 9 ficheros con 26 adiciones y 35 borrados
  1. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java
  2. +2
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  3. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  4. +3
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  5. +7
    -6
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  6. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  7. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  8. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java
  9. +3
    -16
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java

+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java Ver fichero

@@ -3,6 +3,7 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxActivityJoin;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
@@ -37,7 +38,7 @@ public class WxActivityJoinController extends BaseController {
if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin();
wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setUserId(getUserId());
wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setTenantId(getTenantId());
wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC);
wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 2
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java Ver fichero

@@ -3,6 +3,7 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCampaign;
import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
@@ -25,8 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;


import static com.iformall.domain.po.WxCampaign.Field.CreateTime_ASC;
import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC;


@RestController @RestController
@RequestMapping("/api/wxCampaign") @RequestMapping("/api/wxCampaign")
@@ -49,7 +48,7 @@ public class WxCampaignController extends BaseController {


wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.setTenantId(getTenantId()); wxCampaign.setTenantId(getTenantId());
wxCampaign.setSortColumns(SortNum_ASC, CreateTime_ASC);
wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC);
final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 3
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Ver fichero

@@ -808,11 +808,11 @@ public class WxCarController extends BaseController {
wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setTenantId(getTenantId());
wxCouponOrder.setCUserId(getUserId()); wxCouponOrder.setCUserId(getUserId());
if (wxCouponOrder.getCouponOrderStatus() == null) if (wxCouponOrder.getCouponOrderStatus() == null)
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
else else
wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
return wxCouponOrderService.carListCUserVoAsPage(wxCouponOrder, pageNum, pageSize); return wxCouponOrderService.carListCUserVoAsPage(wxCouponOrder, pageNum, pageSize);
} }




+ 3
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Ver fichero

@@ -1,6 +1,7 @@
package com.iformall.controller; package com.iformall.controller;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelActivityStatus;
@@ -49,7 +50,7 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());


wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC);
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page); filterTimed(wxCouponChannel, page);
return new ResultData(page); return new ResultData(page);
@@ -64,7 +65,7 @@ public class WxCouponChannelController extends BaseController {
public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) {
wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTenantId(getTenantId());
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC);
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);


Map<String,Object> map = new HashedMap(); Map<String,Object> map = new HashedMap();
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize);


+ 7
- 6
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Ver fichero

@@ -3,6 +3,7 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.vo.WxCardCVo; import com.iformall.domain.vo.WxCardCVo;
import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.domain.vo.WxCouponOrderCVo;
@@ -49,11 +50,11 @@ public class WxCouponOrderController extends BaseController {
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo();
wxCouponOrder.setCUserId(getUserId()); wxCouponOrder.setCUserId(getUserId());
if (wxCouponOrder.getCouponOrderStatus() == null) if (wxCouponOrder.getCouponOrderStatus() == null)
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC);
else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC);
else else
wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC, WxCouponOrder.Field.Id_DESC);
wxCouponOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);


PageInfo<WxCouponOrderCVo> page = wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); PageInfo<WxCouponOrderCVo> page = wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize);


@@ -150,11 +151,11 @@ public class WxCouponOrderController extends BaseController {
} }
} }
if (cardCVo.getCouponOrderStatus() == null) if (cardCVo.getCouponOrderStatus() == null)
cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode())
cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
else else
cardCVo.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC);
cardCVo.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
return wxCouponOrderService.listCardVoAsPage(cardCVo, pageNum, pageSize); return wxCouponOrderService.listCardVoAsPage(cardCVo, pageNum, pageSize);
} }




+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Ver fichero

@@ -3,6 +3,7 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.domain.vo.WxCreditHistoryVo;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
@@ -48,7 +49,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.CreateDate_DESC,WxCreditHistory.Field.Id_DESC);
wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.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);
} }


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Ver fichero

@@ -214,7 +214,7 @@ public class WxOrderController extends BaseController {
// c端用户应该只能看到自己的订单 // c端用户应该只能看到自己的订单
if (wxOrder == null) wxOrder = new WxOrder(); if (wxOrder == null) wxOrder = new WxOrder();
wxOrder.setCUserId(getUserId()); wxOrder.setCUserId(getUserId());
wxOrder.setSortColumns(WxOrder.Field.UpdateDate_DESC);
wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize);


Date now = new Date(); Date now = new Date();
@@ -345,7 +345,7 @@ public class WxOrderController extends BaseController {
// c端用户应该只能看到自己的订单 // c端用户应该只能看到自己的订单
if (wxOrder == null) wxOrder = new WxOrder(); if (wxOrder == null) wxOrder = new WxOrder();
wxOrder.setCUserId(getUserId()); wxOrder.setCUserId(getUserId());
wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC);
wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java Ver fichero

@@ -3,6 +3,7 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxScoreHistory; import com.iformall.domain.po.WxScoreHistory;
import com.iformall.service.WxScoreHistoryService; import com.iformall.service.WxScoreHistoryService;
@@ -31,7 +32,7 @@ public class WxScoreHistoryController extends BaseController {
WxScoreHistory wxScoreHistory = new WxScoreHistory(); WxScoreHistory wxScoreHistory = new WxScoreHistory();
wxScoreHistory.setTenantId(getTenantId()); wxScoreHistory.setTenantId(getTenantId());
wxScoreHistory.setCUserId(getUserId()); wxScoreHistory.setCUserId(getUserId());
wxScoreHistory.setSortColumns(WxScoreHistory.Field.CreateDate_DESC);
wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 3
- 16
mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java Ver fichero

@@ -91,22 +91,6 @@ public class BaseEntity implements Serializable {
return result.toString(); return result.toString();
} }


public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}


public void setSortColumns(SortField... fields) public void setSortColumns(SortField... fields)
{ {
@@ -158,6 +142,9 @@ public class BaseEntity implements Serializable {
LimitDate_ASC("`limit_date` ASC"), LimitDate_ASC("`limit_date` ASC"),
LimitDate_DESC("`limit_date` DESC"), LimitDate_DESC("`limit_date` DESC"),


SortNum_ASC("`sort_num` ASC"),
SortNum_DESC("`sort_num` DESC"),

Sort_ASC("`sort` ASC"), Sort_ASC("`sort` ASC"),
Sort_DESC("`sort` DESC"), Sort_DESC("`sort` DESC"),




Cargando…
Cancelar
Guardar