fix:修改密码，弹出所有端

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -40,7 +40,6 @@ import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.auth.service.SysUserService;
 import com.yonge.cooleshow.auth.web.controller.queryInfo.RoleQueryInfo;
 import com.yonge.cooleshow.common.constant.CommonConstants;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
@@ -218,12 +217,26 @@ public class UserController extends BaseController {
             sysUser.setPassword(password);
             sysUser.setUpdateTime(new Date());
             sysUserService.update(sysUser);
+
+            loginOut(sysUser);
             return succeed();
         } else {
             return failed("验证码错误");
         }
     }
 
+    private void loginOut(SysUser sysUser) {
+        if(sysUser.getUserType().contains("STUDENT")){
+            tokenService.revokeToken("student", sysUser.getPhone());
+        }
+        if(sysUser.getUserType().contains("TEACHER")){
+            tokenService.revokeToken("teacher", sysUser.getPhone());
+        }
+        if(sysUser.getUserType().contains("SYSTEM")){
+            tokenService.revokeToken("system", sysUser.getPhone());
+        }
+    }
+
     @ApiOperation(value = "原密码修改密码")
     @PostMapping(value = "/updatePasswordByOldPassword")
     public Object updatePasswordByOldPassword(@RequestBody UpdatePasswordDto updatePasswordDto) {
@@ -317,15 +330,7 @@ public class UserController extends BaseController {
         sysUser.setLockFlag(lockFlag);
         
         if(lockFlag == 1){
-        	if(sysUser.getUserType().contains("STUDENT")){
-        		tokenService.revokeToken("student", sysUser.getPhone());
-        	}
-        	if(sysUser.getUserType().contains("TEACHER")){
-        		tokenService.revokeToken("teacher", sysUser.getPhone());
-        	}
-        	if(sysUser.getUserType().contains("SYSTEM")){
-        		tokenService.revokeToken("system", sysUser.getPhone());
-        	}
+            loginOut(sysUser);
         }
         sysUser.setUpdateTime(new Date());
         sysUserService.update(sysUser);

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -378,6 +378,24 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
         OmsOrder cancelOrder = cancelOrderList.get(0);
         if (cancelOrder != null && (cancelOrder.getStatus() == 0 || cancelOrder.getStatus() == 6)) {
+
+            // 查询订单是否为支付
+            UserOrderPayment orderPayment = userOrderPaymentService.getByOrderNoAndStatusPaying(cancelOrder.getOrderSn());
+
+            if (orderPayment != null) {
+                // 查询订单信息
+                BaseResult<Payment> res = getPaymentBaseResult(orderPayment);
+                //支付成功
+                if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(res.getData().getStatus().getCode())
+                        && cancelOrder.getStatus() == 0) {
+                    orderSuccess(cancelOrder,null, res.getData());
+                    return;
+                }
+
+                //查询订单下支付中的付款单，取消支付
+                userOrderPaymentService.closePayment(orderPayment.getOrderNo(),  "用户发起了新的付款请求", null);
+            }
+
             //修改订单状态为取消
             cancelOrder.setStatus(4);
             orderMapper.updateByPrimaryKeySelective(cancelOrder);