Merge branch 'master_saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -46,7 +46,7 @@ public interface SysUserFeignService {
 									@RequestParam("clientId")String clientId,
 									@RequestParam("clientSecret")String clientSecret);
 
-	@GetMapping(value = "exit")
+	@PostMapping(value = "exit")
 	@ApiOperation(value = "退出登录")
 	HttpResponseResult<String> logout();
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -156,6 +156,21 @@ public class TokenController extends BaseController {
 		return succeed("退出成功");
 	}
 
+	@GetMapping(value = "exit")
+	@ApiOperation(value = "退出登录")
+	public HttpResponseResult<String> logoutGet(HttpServletRequest request) {
+		String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
+		if (StringUtils.isBlank(authHeader)) {
+			return failed("退出失败，token 为空");
+		}
+
+		String tokenValue = authHeader.toLowerCase().replace(OAuth2AccessToken.BEARER_TYPE.toLowerCase(), StringUtils.EMPTY).trim();
+
+		tokenService.revokeToken(tokenValue);
+
+		return succeed("退出成功");
+	}
+
 	@PostMapping(value = "exit/{clientId}/{phone}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	@ApiOperation(value = "指定用户退出登录")
 	public HttpResponseResult<String> exitByPhone(@PathVariable("clientId") String clientId, @PathVariable("phone") String phone) {

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -246,4 +246,6 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     void mallBuyOrderCallback(StudentPaymentOrder order);
 
     void mallSaveOrderInfo(MallCreateOrderModel model);
+
+    OrderCancelModel cancelOrder(StudentPaymentOrder orderByOrderNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1109,6 +1109,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         studentPaymentOrder.setOrderNo(model.getOrderNo());
         studentPaymentOrder.setCreateTime(date);
         studentPaymentOrder.setUpdateTime(date);
+        studentPaymentOrder.setPaymentChannel("ADAPAY");
         studentPaymentOrder.setOrganId(student.getOrganId());
         studentPaymentOrder.setRoutingOrganId(student.getOrganId());
         studentPaymentOrder.setTenantId(student.getTenantId());
@@ -1218,4 +1219,22 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         studentGoodsSell.setGoodsType("MALL");
         studentGoodsSellDao.update(studentGoodsSell);
     }
+
+    @Override
+    public OrderCancelModel cancelOrder(StudentPaymentOrder order) {
+        OrderCancelModel model = new OrderCancelModel();
+        try {
+            TenantContextHolder.setTenantId(order.getTenantId());
+            order.setStatus(CLOSE);
+            order.setMemo("超时未支付关闭");
+            callOrderCallBack(order);
+            TenantContextHolder.clearTenantId();
+            model.setSuccess(true);
+            model.setStatus(false);
+        } catch (Exception e) {
+            model.setSuccess(false);
+            e.printStackTrace();
+        }
+        return model;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -507,7 +507,7 @@
         WHERE status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND payment_channel_ = #{paymentChannel}
     <!--  商城订单由商城控制订单超时      -->
-        and group_type_ = 'MALL_SELL' and type_ = 'MALL_BUY'
+        and group_type_ != 'MALL_SELL' and type_ != 'MALL_BUY'
     </select>
 
     <!-- 查询支付中超时订单 -->

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

@@ -789,19 +789,21 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
             orderPayment.setStatus(TradeStatusEnum.succeeded.getCode());
             userOrderPaymentService.saveOrUpdate(orderPayment);
-
+            Map<String,Object> notifyMap = new HashMap<>();
+            notifyMap.put("channelType", payChannel);
+            notifyMap.put("tradeState", "1");
+            notifyMap.put("totalMoney", payAmount);
+            notifyMap.put("merOrderNo",orderNo);
+            HttpResponseResult httpResponseResult = webFeignService.updateOrder(notifyMap);
+            if (!httpResponseResult.getStatus()) {
+                throw new BizException(httpResponseResult.getMsg());
+            }
         } else {
             LOG.error("汇付支付回调，订单状态异常。 req is {}", detail.getOrderSn());
+
+            // 金额退回
         }
-        Map<String,Object> notifyMap = new HashMap<>();
-        notifyMap.put("channelType", payChannel);
-        notifyMap.put("tradeState", "1");
-        notifyMap.put("totalMoney", payAmount);
-        notifyMap.put("merOrderNo",orderNo);
-        HttpResponseResult httpResponseResult = webFeignService.updateOrder(notifyMap);
-        if (!httpResponseResult.getStatus()) {
-            throw new BizException(httpResponseResult.getMsg());
-        }
+
     }
 
 
@@ -829,15 +831,13 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             // 修改用户付款状态
             orderPayment.setStatus(TradeStatusEnum.failed.getCode());
             userOrderPaymentService.saveOrUpdate(orderPayment);
+            HttpResponseResult httpResponseResult = webFeignService.updateOrder(notifyMap);
+            if (!httpResponseResult.getStatus()) {
+                throw new BizException(httpResponseResult.getMsg());
+            }
         } else {
             LOG.error("汇付支付回调，订单状态异常。 req is {}", orderNo);
         }
-
-
-        HttpResponseResult httpResponseResult = webFeignService.updateOrder(notifyMap);
-        if (!httpResponseResult.getStatus()) {
-            throw new BizException(httpResponseResult.getMsg());
-        }
     }
 
     @Override

mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -175,7 +175,7 @@ public class APIController extends BaseController {
 
 
 	@PostMapping("/updateOrder")
-	public HttpResponseResult notify(@RequestBody Map map) {
+	public HttpResponseResult updateOrder(@RequestBody Map map) {
 
 		try {
 			studentPaymentOrderService.updateOrder(map);
@@ -204,8 +204,7 @@ public class APIController extends BaseController {
 				cancelModel.setStatus(false);
 				return succeed(cancelModel);
 			}
-			cancelModel = studentPaymentOrderService.updateOrderStatus(new Date(), new HashMap<>(),
-																						 orderByOrderNo, false);
+			cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo);
 			return succeed(cancelModel);
 		} catch (Exception e) {
 			e.printStackTrace();