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

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

@@ -157,7 +157,7 @@ public class PaymentController extends BaseController {
      * @updateTime 2022/3/11 18:35
      */
     @RequestMapping("/callback_yee/{tenantId}")
-    public Object callback_yee(@PathVariable("tenantId") Integer tenantId, HttpServletRequest request) {
+    public String callback_yee(@PathVariable("tenantId") Integer tenantId, HttpServletRequest request) {
         try {
             String content = request.getParameter("response");
             log.info("易宝支付回调信息：content:{}", content);
@@ -197,7 +197,7 @@ public class PaymentController extends BaseController {
         } catch (Exception e) {
             return e.getMessage();
         }
-        return "SUCCESS";
+        return "succeeded";
     }
 
 }

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

@@ -1010,9 +1010,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             LOG.error("订单金额和实际支付金额不符");
             throw new BizException("订单金额和实际支付金额不符");
         } else {
-            if ("alipay_qr".equals(payChannel) || "alipay_wap".equals(payChannel)) {
+            if ("alipay_qr".equals(payChannel) || "ALIPAY".equals(payChannel) || "alipay_wap".equals(payChannel)) {
                 paySuccess(detail.getId(), 1);
-            } else if ("wx_pub".equals(payChannel) || "wx_app".equals(payChannel)) {
+            } else if ("wx_pub".equals(payChannel) || "WXPay".equals(payChannel) || "wx_app".equals(payChannel)) {
                 paySuccess(detail.getId(), 2);
             }
         }