打款户拖拽排序接口

gic-platform-finance-service/src/main/java/com/gic/finance/service/PayAccountService.java

@@ -45,6 +45,17 @@ public interface PayAccountService {
     TabPayAccount getById(Integer id);
 
     /**
+     * 拖拽排序
+     * @Title: setSort

+     * @Description:
+    
 * @author guojuxing
+     * @param record
+     * @param sortValue

+     * @return  void

+    
 */
+    void setSort(TabPayAccount record, Integer sortValue);
+
+    /**
      * 查询排序值最大的，即排在最末
      * @Title: getTheMaxSort

      * @Description:

gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/PayAccountServiceImpl.java

@@ -39,6 +39,33 @@ public class PayAccountServiceImpl implements PayAccountService {
     }
 
     @Override
+    public void setSort(TabPayAccount record, Integer sortValue) {
+        List<TabPayAccount> list = tabPayAccountMapper.listPayAccount();
+        Integer fromSortValue = record.getSort();
+        if (fromSortValue > sortValue) {
+            //向上拖拽
+            for (int i = 0, length = list.size(); i < length; i++) {
+                TabPayAccount temp = list.get(i);
+                //如果大于sortValue，都需要降低排序值,往后推
+                boolean isNeedDown = temp.getSort() >= sortValue && temp.getSort() < fromSortValue;
+                if (isNeedDown) {
+                    updateSort(list.get(i + 1).getSort(), temp.getPayAccountId());
+                }
+            }
+        } else if (fromSortValue < sortValue) {
+            //向下拖拽
+            for (int i = 0, length = list.size(); i < length; i++) {
+                TabPayAccount temp = list.get(i);
+                boolean isNeedUp = temp.getSort() <= sortValue && temp.getSort() > fromSortValue;
+                if (isNeedUp) {
+                    updateSort(list.get(i - 1).getSort(), temp.getPayAccountId());
+                }
+            }
+        }
+        updateSort(sortValue, record.getPayAccountId());
+    }
+
+    @Override
     public int getTheMaxSort() {
         return tabPayAccountMapper.getMaxSort();
     }
@@ -57,4 +84,11 @@ public class PayAccountServiceImpl implements PayAccountService {
     public TabPayAccount getNextOfSort(Integer sort) {
         return null;
     }
+
+    private void updateSort(Integer sort, Integer id) {
+        TabPayAccount record = new TabPayAccount();
+        record.setPayAccountId(id);
+        record.setSort(sort);
+        tabPayAccountMapper.updateByPrimaryKeySelective(record);
+    }
 }

gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/PayAccountApiServiceImpl.java

@@ -64,6 +64,19 @@ public class PayAccountApiServiceImpl implements PayAccountApiService {
     }
 
     @Override
+    public ServiceResponse<Void> setSort(Integer id, Integer sort) {
+        TabPayAccount tab = payAccountService.getById(id);
+        if (tab == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，无此记录");
+        }
+        if (sort == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "排序值不能为空");
+        }
+        payAccountService.setSort(tab, sort);
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Void> upSort(Integer id) {
         TabPayAccount tab = payAccountService.getById(id);
         if (tab == null) {

gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/TransferAccountsApprovalApiServiceImpl.java

@@ -167,6 +167,9 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
         if (tab == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "订单流水号有误");
         }
+        if (tab.getApprovalStatus().intValue() != TransferAccountApprovalStatusEnum.TO_BE_APPROVED.getCode()) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "此订单已审核，不能取消");
+        }
         updateCancelApproval(tab.getTransferApprovalId());
         return ServiceResponse.success();
     }
@@ -177,6 +180,9 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
         if (tab == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转账审批主键有误");
         }
+        if (tab.getApprovalStatus().intValue() != TransferAccountApprovalStatusEnum.TO_BE_APPROVED.getCode()) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "此订单已审核，不能取消");
+        }
         updateCancelApproval(transferApprovalId);
         return ServiceResponse.success();
     }

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/CashWithdrawalController.java

@@ -69,6 +69,19 @@ public class CashWithdrawalController {
         return ResultControllerUtils.commonResult(payAccountApiService.upSort(id));
     }
 
+    /**
+     * 拖拽排序
+     * @Title: setSort

+     * @Description:
+    
 * @author guojuxing
+     * @param id

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/set-sort")
+    public RestResponse setSort(Integer id, Integer sortValue) {
+        return ResultControllerUtils.commonResult(payAccountApiService.setSort(id, sortValue));
+    }
+
     @RequestMapping("/delete-pay-account")
     public RestResponse deletePayAccount(Integer id) {
         return ResultControllerUtils.commonResult(payAccountApiService.delete(id));