Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -249,7 +249,7 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
 
     void mallSaveOrderInfo(MallCreateOrderModel model);
 
-    OrderCancelModel cancelOrder(StudentPaymentOrder orderByOrderNo);
+    OrderCancelModel cancelOrder(StudentPaymentOrder orderByOrderNo, String reason);
 
     // 撤销支付
     BaseResult<Map<String, Object>> refund(String orderNo, String notifyUrl, String refundNo);

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -1093,6 +1092,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
             // 已有订单，先关单
             orderByOrderNo.setStatus(CLOSE);
+            orderByOrderNo.setMemo("关闭订单");
             studentPaymentOrderService.update(orderByOrderNo);
             if (orderByOrderNo.getBalancePaymentAmount() != null && orderByOrderNo.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
                 sysUserCashAccountService.updateBalance(orderByOrderNo.getUserId(), orderByOrderNo.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "关闭订单");
@@ -1271,7 +1271,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional
-    public OrderCancelModel cancelOrder(StudentPaymentOrder order) {
+    public OrderCancelModel cancelOrder(StudentPaymentOrder order, String reason) {
         OrderCancelModel model = new OrderCancelModel();
         try {
             HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(order.getTenantId());
@@ -1289,7 +1289,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             } else if (status.equals("failed") ) {
                 model.setStatus(false);
                 order.setStatus(CLOSE);
-                order.setMemo("超时未支付关闭");
+                order.setMemo(reason);
             }
             TenantContextHolder.setTenantId(order.getTenantId());
             callOrderCallBack(order);

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

@@ -1395,6 +1395,14 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
+            <if test="null != hasMember">
+                <if test="1 == hasMember">
+                    and s.membership_end_time_ &gt; now()
+                </if>
+                <if test="0 == hasMember">
+                    and (s.membership_end_time_ is null or t.membership_end_time_ &lt;= now())
+                </if>
+            </if>
         </where>
         ORDER BY user_id_
         <include refid="global.limit"></include>

mec-client-api/src/main/java/com/ym/mec/web/WebFeignService.java

@@ -53,7 +53,7 @@ public interface WebFeignService {
 	HttpResponseResult updateOrder(@RequestBody Map map);
 
 	@PostMapping("/api/cancelOrder")
-	HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam("orderNo") String orderNo);
+	HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam("orderNo") String orderNo,@RequestParam("reason") String reason);
 
 
 

mec-client-api/src/main/java/com/ym/mec/web/fallback/WebFeignServiceFallback.java

@@ -75,10 +75,11 @@ public class WebFeignServiceFallback implements WebFeignService {
 	}
 
 	@Override
-	public HttpResponseResult<OrderCancelModel> cancelOrder(String orderNo) {
+	public HttpResponseResult<OrderCancelModel> cancelOrder(String orderNo, String reason) {
 		return null;
 	}
 
+
 	@Override
 	public HttpResponseResult<Map> mallSaveOrderInfo(MallCreateOrderModel model) {
 		return null;

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

@@ -567,7 +567,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNoAndStatusPaying(
                     cancelOrder.getOrderSn());
             if (userOrderPayment != null) {
-                HttpResponseResult<OrderCancelModel> responseResult = webFeignService.cancelOrder(userOrderPayment.getAdapayNo());
+                HttpResponseResult<OrderCancelModel> responseResult = webFeignService.cancelOrder(userOrderPayment.getAdapayNo(),message);
                 if (!responseResult.getStatus()) {
                     throw new BizException("远程取消失败");
                 }

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

@@ -168,7 +168,7 @@ public class APIController extends BaseController {
 	 *
 	 */
 	@PostMapping("/cancelOrder")
-	public HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam String orderNo) {
+	public HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam String orderNo,@RequestParam String reason) {
 
 		OrderCancelModel cancelModel = new OrderCancelModel();
 		StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
@@ -177,7 +177,7 @@ public class APIController extends BaseController {
 			cancelModel.setStatus(false);
 			return succeed(cancelModel);
 		}
-		cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo);
+		cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo,reason);
 		return succeed(cancelModel);
 	}