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

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

@@ -17,7 +17,9 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.MallCreateOrderModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -87,6 +89,18 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
 
     void queryOrderStatus() throws Exception;
 
+
+    /**
+     *  检查并修改订单状态
+     *
+     * @param date
+     * @param payConfigMap
+     * @param payingOrder
+     * @param checkTime
+     * @return
+     */
+    Boolean updateOrderStatus(Date date, Map<Integer, HfMerchantConfig> payConfigMap, StudentPaymentOrder payingOrder, Boolean checkTime) throws Exception;
+
     //退优惠券和余额
     void quitCouponAndBalance(StudentPaymentOrder order);
 

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

@@ -32,7 +32,6 @@ import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import com.ym.mec.thirdparty.yqpay.*;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -308,44 +307,56 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             if (DateUtil.minutesBetween(payingOrder.getCreateTime(), date) < 10) {
                 continue;
             }
-            
-            hfMerchantConfig = payConfigMap.get(payingOrder.getTenantId());
+
+            updateOrderStatus(date, payConfigMap, payingOrder,true);
+        }
+        closeOrders(orderNoList);
+    }
+
+    @Override
+    @Transactional
+    public Boolean updateOrderStatus(Date date,  Map<Integer, HfMerchantConfig> payConfigMap, StudentPaymentOrder payingOrder, Boolean checkTime) throws Exception {
+        if (payConfigMap == null) {
+            throw new BizException("payConfigMap 不能为空");
+        }
+        HfMerchantConfig hfMerchantConfig;
+        hfMerchantConfig = payConfigMap.get(payingOrder.getTenantId());
+        if(hfMerchantConfig == null){
+            hfMerchantConfig = hfMerchantConfigService.queryByTenantId(payingOrder.getTenantId());
             if(hfMerchantConfig == null){
-            	hfMerchantConfig = hfMerchantConfigService.queryByTenantId(payingOrder.getTenantId());
-                if(hfMerchantConfig == null){
-                	throw new BizException("机构[{}]汇付商户信息找不到", payingOrder.getTenantId());
-                }
-            	payConfigMap.put(payingOrder.getTenantId(), hfMerchantConfig);
+                throw new BizException("机构[{}]汇付商户信息找不到", payingOrder.getTenantId());
             }
-            
-            Map<String, Object> payment = Payment.queryPayment(payingOrder.getTransNo(), hfMerchantConfig.getMerKey());
-            LOGGER.info("订单[{}]交易主动查询接口返回：{}", payingOrder.getTransNo(), payment);
+            payConfigMap.put(payingOrder.getTenantId(), hfMerchantConfig);
+        }
 
-            Map<String, String> rpMap = new HashMap<>();
-            rpMap.put("merOrderNo", payingOrder.getOrderNo());
-            rpMap.put("orderNo", payingOrder.getTransNo());
-            rpMap.put("channelType", (String) payment.get("pay_channel"));
-            String status = (String) payment.get("status");
-            if (payment.containsKey("error_msg")) {
-                rpMap.put("remarks", (String) payment.get("error_msg"));
-            }
-            if (status.equals("succeeded")) {
-                rpMap.put("tradeState", "1");
-            } else if (status.equals("failed") || (DateUtil.minutesBetween(DateUtil.addHours(payingOrder.getUpdateTime(), 2), date) > 0)) {
-                rpMap.put("tradeState", "0");
-            }
+        Map<String, Object> payment = Payment.queryPayment(payingOrder.getTransNo(), hfMerchantConfig.getMerKey());
+        LOGGER.info("订单[{}]交易主动查询接口返回：{}", payingOrder.getTransNo(), payment);
 
-            if (status.equals("succeeded") ||
-                    (status.equals("failed") || payingOrder.getCreateTime().before(DateUtil.addMinutes(new Date(), -35)))) {
-                try {
-                    updateOrder(rpMap); //更新订单
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    continue;
-                }
+        Map<String, String> rpMap = new HashMap<>();
+        rpMap.put("merOrderNo", payingOrder.getOrderNo());
+        rpMap.put("orderNo", payingOrder.getTransNo());
+        rpMap.put("channelType", (String) payment.get("pay_channel"));
+        String status = (String) payment.get("status");
+        if (payment.containsKey("error_msg")) {
+            rpMap.put("remarks", (String) payment.get("error_msg"));
+        }
+        if (status.equals("succeeded")) {
+            rpMap.put("tradeState", "1");
+        } else if (status.equals("failed") || !checkTime
+                || (DateUtil.minutesBetween(DateUtil.addHours(payingOrder.getUpdateTime(), 2),date) > 0)) {
+            rpMap.put("tradeState", "0");
+        }
+
+        if (status.equals("succeeded") ||
+                (status.equals("failed") || !checkTime || payingOrder.getCreateTime().before(DateUtil.addMinutes(new Date(), -35)))) {
+            try {
+                updateOrder(rpMap); //更新订单
+            } catch (Exception e) {
+                e.printStackTrace();
+                return false;
             }
         }
-        closeOrders(orderNoList);
+        return true;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1023,7 +1034,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(model.getCouponIdList(), model.getAmount(),false);
 
-        studentPaymentOrder.setGroupType(GroupType.GOODS_SELL);
+        studentPaymentOrder.setGroupType(GroupType.MALL_SELL);
         studentPaymentOrder.setUserId(model.getUserId());
         studentPaymentOrder.setType(OrderTypeEnum.MALL_BUY);
         studentPaymentOrder.setOrderNo(model.getOrderNo());
@@ -1047,7 +1058,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 "商品销售",
                 "商品销售",
                 student.getOrganId(),
-                "renew"
+                "mall_buy"
         );
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));

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

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

mec-client-api/src/main/java/com/ym/mec/oa/OaFeignService.java

@@ -28,7 +28,7 @@ public interface OaFeignService {
      * @return
      */
     @PostMapping(value = "/updateUser", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Object updateUser(@RequestBody OAUser oaUser);
+    Object updateUser(OAUser oaUser);
 
     /**
      * 软删除

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

@@ -39,12 +39,12 @@ public interface WebFeignService {
 	@GetMapping(value = "/queryByTenantId/{id}")
 	HttpResponseResult<HfMerchantConfig> queryByTenantId(@PathVariable("id") Integer id);
 
-	@PostMapping("/mallCreateOrder")
+	@PostMapping("/api/mallCreateOrder")
 	HttpResponseResult<Map> mallCreateOrder(@RequestBody MallCreateOrderModel model);
 
-	@PostMapping("/executePayment")
+	@PostMapping("/api/executePayment")
 	HttpResponseResult executePayment(@RequestBody Map paymentParam);
 
-	@PostMapping("/updateOrder")
+	@PostMapping("/api/updateOrder")
 	HttpResponseResult updateOrder(@RequestBody Map map);
 }

mec-common/common-core/src/main/java/com/ym/mec/common/entity/OrderCancelModel.java

@@ -0,0 +1,33 @@
+package com.ym.mec.common.entity;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-09-19
+ */
+public class OrderCancelModel {
+
+    // 修改状态  true:支付失败，false 支付成功
+    private boolean status;
+
+
+    // 调用状态  true:成功  false 失败
+    private Boolean success;
+
+    public boolean isStatus() {
+        return status;
+    }
+
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+}

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
@@ -16,6 +17,7 @@ import org.springframework.context.annotation.ComponentScan;
 @MapperScan({"com.yonge.cooleshow.admin.dao", "com.yonge.cooleshow.mbg.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.admin", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common","com.ym.mec"})
 @EnableSwagger2Doc
+@EnableFeignClients("com.ym.mec")
 public class MallAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(MallAdminApplication.class, args);

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/MallPortalApplication.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.ComponentScan;
 @ComponentScan(basePackages = {"com.yonge.cooleshow.portal", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common","com.ym.mec"})
 @EnableSwagger2Doc
 @EnableDiscoveryClient
-@EnableFeignClients("com.yonge.cooleshow")
+@EnableFeignClients("com.ym.mec")
 public class MallPortalApplication {
 
     public static void main(String[] args) {

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

@@ -170,4 +170,17 @@ public class APIController extends BaseController {
 		return succeed();
 	}
 
+
+	@PostMapping("/cancelOrder")
+	public HttpResponseResult cancelOrder(@RequestBody Map map) {
+
+		try {
+			studentPaymentOrderService.updateOrder(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return failed();
+		}
+		return succeed();
+	}
+
 }