Merge branch 'master' of wangchaoqun/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2576,7 +2576,7 @@ public class OrderServiceImpl implements OrderService {
                 if (parCode.startsWith("28")) {
                     // 支付宝支付
                     try {
-//                        AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
+                        AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
                     } catch (Exception e) {
                         LOGGER.error("支付宝支付出现异常！订单号：【{}】", order.getOrder_sn(), e);
                         throw e;
@@ -2584,7 +2584,7 @@ public class OrderServiceImpl implements OrderService {
                 } else {
                     // 微信支付
                     try {
-//                        wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+                        wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
                     } catch (Exception e) {
                         e.printStackTrace();
                         throw e;