瀏覽代碼

fixed数据查询的排序方式

fushengqian 1 年之前
父節點
當前提交
dcab7ca7fc

+ 4 - 4
fuint-application/src/main/java/com/fuint/common/service/RefundService.java

@@ -75,10 +75,10 @@ public interface RefundService extends IService<MtRefund> {
     /**
      * 发起退款
      *
-     * @param orderId
-     * @param refundAmount
-     * @param remark
-     * @param accountInfo
+     * @param orderId 订单号
+     * @param refundAmount 退款金额
+     * @param remark 备注
+     * @param accountInfo 操作人信息
      * throws BusinessCheckException;
      * */
     Boolean doRefund(Integer orderId, String refundAmount, String remark, AccountInfo accountInfo) throws BusinessCheckException;

+ 0 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCateController.java

@@ -111,7 +111,6 @@ public class BackendCateController extends BaseController {
         }
 
         paginationRequest.setSearchParams(params);
-        paginationRequest.setSortColumn(new String[]{"sort asc", "status asc"});
         PaginationResponse<GoodsCateDto> paginationResponse = cateService.queryCateListByPagination(paginationRequest);
 
         Map<String, Object> paramsStore = new HashMap<>();

+ 0 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSendLogController.java

@@ -108,7 +108,6 @@ public class BackendSendLogController extends BaseController {
             }
         }
 
-        paginationRequest.setSortColumn(new String[]{"updateTime desc", "id desc"});
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<MtSendLog> paginationResponse = sendLogService.querySendLogListByPagination(paginationRequest);
 

+ 0 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java

@@ -113,7 +113,6 @@ public class BackendStockController extends BaseController {
         }
 
         paginationRequest.setSearchParams(params);
-        paginationRequest.setSortColumn(new String[]{"sort asc", "status asc"});
         PaginationResponse<MtStock> paginationResponse = stockService.queryStockListByPagination(paginationRequest);
 
         Map<String, Object> paramsStore = new HashMap<>();

+ 0 - 20
fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -70,7 +70,6 @@ public class MerchantMemberController extends BaseController {
         String birthday = memberListParam.getBirthday();
         String userNo = memberListParam.getUserNo();
         String gradeId = memberListParam.getGradeId();
-        String orderBy = memberListParam.getOrderBy() == null ? "" : memberListParam.getOrderBy();
         String regTime = memberListParam.getRegTime() == null ? "" : memberListParam.getRegTime();
         String activeTime = memberListParam.getActiveTime() == null ? "" : memberListParam.getActiveTime();
         String memberTime = memberListParam.getMemberTime() == null ? "" : memberListParam.getMemberTime();
@@ -144,25 +143,6 @@ public class MerchantMemberController extends BaseController {
         if (StringUtil.isNotEmpty(memberTime)) {
             params.put("memberTime", memberTime);
         }
-
-        // 会员排序方式
-        if (StringUtil.isNotEmpty(orderBy)) {
-            if (orderBy.equals("balance")) {
-                paginationRequest.setSortColumn(new String[]{"balance desc"});
-            } else if (orderBy.equals("point")) {
-                paginationRequest.setSortColumn(new String[]{"point desc"});
-            } else if (orderBy.equals("memberGrade")) {
-                paginationRequest.setSortColumn(new String[]{"gradeId desc"});
-            } else if (orderBy.equals("payAmount")) {
-                paginationRequest.setSortColumn(new String[]{"balance desc"});
-            } else if (orderBy.equals("memberTime")) {
-                paginationRequest.setSortColumn(new String[]{"endTime desc", "gradeId desc"});
-                MtUserGrade defaultGrade = userGradeService.getInitUserGrade(mtUser.getMerchantId());
-                if (defaultGrade != null) {
-                    params.put("gradeId", defaultGrade.getId().toString());
-                }
-            }
-        }
         paginationRequest.setSearchParams(params);
         PaginationResponse<UserDto> paginationResponse = memberService.queryMemberListByPagination(paginationRequest);