提交代码

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

@@ -1945,7 +1945,7 @@ public class OrderServiceImpl implements OrderService {
             // 微信支付
 //            wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
             // 支付宝支付
-//            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
+            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
             OrderEntity orderEntity = queryObject(order.getId());
 //            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
 //            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
@@ -2317,7 +2317,7 @@ public class OrderServiceImpl implements OrderService {
             order.setPayStatus(Integer.parseInt(Dict.payStatus.item_4.getItem()));
         }else{
 
-            AliPayMicropayApiResult userRefund = AliPayUtil.aliTradeRefund(order.getMerchOrderSn(), "38.81",
+            AliPayMicropayApiResult userRefund = AliPayUtil.aliTradeRefund(order.getOrderSn(), order.getActualPrice().toString(),
                     "用户退款", order.getStoreId() + "");
 
             LOGGER.info(userRefund.getSubMsg());

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -301,7 +301,7 @@
                         </div>
                         <div class="modal-footer">
                             <button type="button" class="btn btn-primary" @click="verification" id="verification" data-dismiss="modal">核销</button>
-                            <button type="button" class="btn btn-primary" @click="refundOrder" id="refundOrder" data-dismiss="modal">退款</button>
+                            <button type="button" class="btn btn-primary" @click="refundOrder()" id="refundOrder" data-dismiss="modal">退款</button>
                             <!--<button type="button" class="btn btn-primary" @click="retrySendOrder" id="retrySendOrder" data-dismiss="modal">订单重推</button>-->
                         </div>
                     </div>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -734,7 +734,7 @@ let vm = new Vue({
                     type: "POST",
                     url: "../order/orderRefund",
                     contentType: "application/json",
-                    data: JSON.stringify({'orderId':9000,'sessionId':vm.sessionId}),
+                    data: JSON.stringify({'id':vm.currentOrderNo,'sessionId':vm.sessionId}),
                     success: function (r) {
                         if (r.code == 0) {
                             alert("退款成功")
@@ -899,8 +899,8 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
-        webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
-        // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
+        webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');
         }