dd

ruoyi-line/src/main/java/com/ruoyi/onlinerefundorder/service/impl/OnlineRefundOrderServiceImpl.java

@@ -297,6 +297,10 @@ public class OnlineRefundOrderServiceImpl implements IOnlineRefundOrderService {
         Business business = businessService.loadById(bo.getBusinessId(), true);
         bo.setBusinessName(business.getBusinessName());
         User user = userService.getById(business.getRelationUserId(), true);
+        if(StringUtils.isNotBlank(user.getPayPassword()))
+        {
+            throw new ServiceException("请先设置商家用户的支付密码");
+        }
         if(!BCrypt.checkpw(bo.getPayPassword(), user.getPayPassword()))
         {
              throw new ServiceException("支付密码错误");

ruoyi-line/src/main/java/com/ruoyi/subsidy/exception/SubsidyQueueExceptionEnum.java

@@ -18,7 +18,8 @@ public enum SubsidyQueueExceptionEnum implements IIntegerEnum {
     SUBSIDY_QUEUE_IS_CANCEL(200004, "补贴已取消"),
     SUBSIDY_QUEUE_IS_CUT_IN( 200005, "补贴已插队"),
     SUBSIDY_QUEUE_IS_FIRST( 200006, "补贴第一名不能插队"),
-    CUT_IN_SHOULD_SUBSIDY_AMOUNT_ERROR( 200007, "插队应补贴金额需大于已补贴金额,且小于原最多补贴金额。");
+    CUT_IN_SHOULD_SUBSIDY_AMOUNT_ERROR( 200007, "插队应补贴金额需大于已补贴金额,且小于原最多补贴金额。"),
+    SUBSIDY_QUEUE_COMPLETE_NO_CANCEL( 200008, "补贴完成不能取消");
 
     private Integer code;
 

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -465,6 +465,10 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
     public void cancelByType(SubsidyQueue subsidyQueue, SubsidyCancelType cancelType) {
 
         if (SubsidyStatus.COMPLETE.equals(subsidyQueue.getSubsidyStatus())) {
+            if(SubsidyCancelType.QUEUE_CANCEL.equals(cancelType))
+            {
+                throw new ServiceException(SubsidyQueueExceptionEnum.SUBSIDY_QUEUE_COMPLETE_NO_CANCEL);
+            }
             return;
         }
         if (subsidyQueue.getCancelled()) {