Home Esplora Aiuto
Accedi
lvjian
/
kmall-pt
forkato da project/kmall-pt
1
0
Forka 0
File
Sfoglia il codice sorgente

Merge branch 'master' of hyq/kmall-pt into master

黄亚琴 5 anni fa
parent
dab42f7803 b66c6bab67
commit
b905b7b828
10 ha cambiato i file con 71 aggiunte e 40 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 6 0
      kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java
  2. 10 0
      kmall-admin/src/main/java/com/kmall/admin/entity/WxOrderEntity.java
  3. 7 2
      kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderRefundServiceImpl.java
  4. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/orderresend.html
  5. 3 2
      kmall-admin/src/main/webapp/js/shop/orderrefund.js
  6. 28 27
      kmall-admin/src/main/webapp/js/shop/orderresend.js
  7. 2 2
      wx-mall/pages/index/index.js
  8. 12 4
      wx-mall/pages/ucenter/index/index.js
  9. 1 1
      wx-mall/pages/ucenter/index/index.wxml
  10. 1 1
      wx-mall/project.config.json

+ 6 - 0
kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java
Vedi File 

@@ -377,6 +377,8 @@ public class OrderController {
 
                     orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));
 
                     orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
 
                     orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
 
+                    SysUserEntity user = ShiroUtils.getUserEntity();
 
+                    orderRefund.setModerSn(user.getUsername());
 
                     orderRefund.setModTime(new Date());
 
                     orderRefund.setOutRefundNo(tradeResult.getString("ord_no"));
 
                     if (mallOrderRefund != null) {
 
@@ -416,6 +418,8 @@ public class OrderController {
 
             orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));
 
             orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
 
             orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
 
+            SysUserEntity user = ShiroUtils.getUserEntity();
 
+            orderRefund.setModerSn(user.getUsername());
 
             orderRefund.setModTime(new Date());
 
 //            orderRefund.setOutRefundNo(result.getOut_refund_no());
 
             if (mallOrderRefund != null) {
 
@@ -501,6 +505,8 @@ public class OrderController {
 
                     orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
 
                     orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
 
 //                    orderRefund.setOutRefundNo(result.getOut_refund_no());
 
+                    SysUserEntity user = ShiroUtils.getUserEntity();
 
+                    orderRefund.setModerSn(user.getUsername());
 
                     orderRefund.setModTime(new Date());
 
                     if (mallOrderRefund != null) {
 
                         orderRefund.setId(mallOrderRefund.getId());

+ 10 - 0
kmall-admin/src/main/java/com/kmall/admin/entity/WxOrderEntity.java
Vedi File 

@@ -157,6 +157,8 @@ public class WxOrderEntity implements Serializable {
 
 
     private String placeOrderlTimeStr;
 
 
+    private String failMsg;
 
+
 
     public String getPlaceOrderlTimeStr() {
 
         return placeOrderlTimeStr;
 
     }
 
@@ -732,4 +734,12 @@ public class WxOrderEntity implements Serializable {
 
     public void setExField5(String exField5) {
 
         this.exField5 = exField5 == null ? null : exField5.trim();
 
     }
 
+
 
+    public String getFailMsg() {
 
+        return failMsg;
 
+    }
 
+
 
+    public void setFailMsg(String failMsg) {
 
+        this.failMsg = failMsg;
 
+    }
 
 }

+ 7 - 2
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderRefundServiceImpl.java
Vedi File 

@@ -43,17 +43,22 @@ public class OrderRefundServiceImpl implements OrderRefundService {
 
 
     @Override
 
     public int save(OrderRefundEntity orderRefund) {
 
+        SysUserEntity user = ShiroUtils.getUserEntity();
 
+        orderRefund.setCreateSn(user.getUsername());
 
+        orderRefund.setCreateTime(new Date());
 
         return orderRefundDao.save(orderRefund);
 
     }
 
 
     @Override
 
     public int update(OrderRefundEntity orderRefund) {
 
+        SysUserEntity user = ShiroUtils.getUserEntity();
 
         if (StringUtils.isNotEmpty(orderRefund.getApprovalRemark())) {
 
             orderRefund.setApprovalTime(new Date());
 
-            SysUserEntity user = ShiroUtils.getUserEntity();
 
-            orderRefund.setApprover(user.getUserId().toString());
 
+            orderRefund.setApprover(user.getUsername());
 
             orderRefund.setRefundStatus(3);
 
         }
 
+        orderRefund.setModerSn(user.getUsername());
 
+        orderRefund.setModTime(new Date());
 
         return orderRefundDao.update(orderRefund);
 
     }

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/orderresend.html
Vedi File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html>
 
 <head>
 
-    <title>订单退款记录表</title>
 
+    <title>订单ccnet重发记录表</title>
 
     #parse("sys/header.html")
 
 </head>
 
 <body>

+ 3 - 2
kmall-admin/src/main/webapp/js/shop/orderrefund.js
Vedi File 

@@ -59,8 +59,9 @@ $(function () {
 
                 }
 
             },
 
 			{label: '退款原因', name: 'refundReason', index: 'refund_reason', width: 140},
 
+            {label: '退款操作人', name: 'moderSn', index: 'moderSn', width: 80},
 
 			{label: '退款入账账户', name: 'refundRecvAccout', index: 'refund_recv_accout', width: 80, hidden: true},
 
-			{label: '审核人', name: 'approver', index: 'approver', width: 80, hidden: true},
 
+			{label: '审核人', name: 'approver', index: 'approver', width: 80},
 
 			{
 
 			    label: '审核时间', name: 'approvalTime', index: 'approval_time', width: 100,
 
                 formatter: function (value) {
 
@@ -251,4 +252,4 @@ var vm = new Vue({
 
             });
 
         }
 
 	}
 
-});
 
+});

+ 28 - 27
kmall-admin/src/main/webapp/js/shop/orderresend.js
Vedi File 

@@ -4,8 +4,8 @@ $(function () {
 
         url: url,
 
         datatype: "json",
 
         colModel: [
 
-			{label: 'wxOrderSn', name: 'wxOrderSn', index: 'wxOrderSn', key: true, hidden: true},
 
-			{label: '订单编号', name: 'wxOrderId', index: 'wxOrderId', width: 40},
 
+			{label: 'wxOrderId', name: 'wxOrderId', index: 'id', key: true, hidden: true},
 
+			// {label: '订单编号', name: 'wxOrderId', index: 'wxOrderId', width: 40},
 
 			{label: '商户订单编号', name: 'merchOrderId', index: 'merchOrderId', width: 90},
 
 			{label: '商户子订单编号', name: 'orderSn', index: 'orderSn', width: 100},
 
             {label: '商户编号', name: 'merchSn', index: 'merchSn', width: 100},
 
@@ -81,29 +81,32 @@ $(function () {
 
                     return '-';
 
                 }
 
             },
 
-            {
 
-                label: '操作', width: 180, sortable: false,
 
+            {label: '失败原因', name: 'failMsg', index: 'failMsg', width: 100},
 
+            {label: '操作', width: 180, sortable: false,align: 'center',
 
                 formatter: function (value, col, row) {
 
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.wxOrderSn + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
 
-                    if(row.clecOrderStatus==3){
 
-                        htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
-                            'onclick="vm.resendOrder(' + row.wxOrderSn + ')"><i class="fa fa-check-circle"></i>&nbsp;重发电子订单</button>&nbsp;';
 
-                    }
 
-                    if(row.wayOrderStatus==3){
 
-                        htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
-                            'onclick="vm.resendOrder(' + row.wxOrderSn + ')"><i class="fa fa-check-circle"></i>&nbsp;重发运单</button>&nbsp;';
 
-                    }
 
-                    if(row.playOrderStatus==3){
 
-                        htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
-                            'onclick="vm.resendOrder(' + row.wxOrderSn + ')"><i class="fa fa-check-circle"></i>&nbsp;重发支付单</button>&nbsp;';
 
+                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail('+row.wxOrderId+')"><i class="fa fa-info-circle"></i>失败原因</button>&nbsp;';
 
+
 
+                    if (hasPermission('order:resendWxOrder')) {
 
+                        if (row.clecOrderStatus == 3) {
 
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发电子订单</button>&nbsp;';
 
+                        }
 
+                        if (row.wayOrderStatus == 3) {
 
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发运单</button>&nbsp;';
 
+                        }
 
+                        if (row.playOrderStatus == 3) {
 
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
 
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发支付单</button>&nbsp;';
 
+                        }
 
                     }
 
                     return htmlStr;
 
                 }
 
             }],
 
 		viewrecords: true,
 
         height: 645,
 
-        rowNum: 10,
 
-        rowList: [200, 300, 500],
 
+        rowNum: 999,
 
+        // rowList: [200, 300, 500],
 
         rownumbers: true,
 
         rownumWidth: 25,
 
         autowidth: true,
 
@@ -163,10 +166,9 @@ var vm = new Vue({
 
         handleReset: function (name) {
 
             handleResetForm(this, name);
 
         },
 
-        resendOrder: function (orderId, rowId) {
 
+        resendWxOrder: function (rowId) {
 
             let params = {};
 
-            params.orderId = orderId;
 
-            params.refundId = rowId;
 
+            params.wxOrderId = rowId;
 
             confirm('是否确认重发？', function () {
 
                 $.ajax({
 
                     type: "POST",
 
@@ -184,12 +186,11 @@ var vm = new Vue({
 
                 });
 
             })
 
         },
 
-        lookDetail: function (rowId) {
 
-            vm.showList = 1;
 
-            vm.title = "维权订单详情";
 
-            // $.get("../orderrefund/info/" + rowId, function (r) {
 
-            //     vm.orderResend = r.orderRefund;
 
-            // });
 
+        lookDetail: function (sn) {
 
+            // vm.showList = 1;
 
+            // vm.title = "维权订单详情";
 
+            let jqGrid = $("#jqGrid").jqGrid('getRowData',sn);
 
+            alert(jqGrid.failMsg);
 
         }
 
 	}
 
 });

+ 2 - 2
wx-mall/pages/index/index.js
Vedi File 

@@ -34,7 +34,7 @@ Page({
 
     // options.scene = 148;
 
     // options.scene = 93;
 
     // options.scene = 38;
 
-    options.scene = 67;
 
+    // options.scene = 67;
 
     // options.scene = 28;
 
     // options.scene = 8;
 
     if (options.scene) {
 
@@ -839,4 +839,4 @@ Page({
 
     });
 
     that.getGoodsList();
 
   }
 
-})
 
+})

+ 12 - 4
wx-mall/pages/ucenter/index/index.js
Vedi File 

@@ -67,6 +67,9 @@ Page({
 
       // 根据用户信息查询订单信息
 
       util.request(api.UcenterIndex, {}).then(function (res) {
 
         if (res.errno === 0) {
 
+          that.setData({
 
+            isQueryCrossQuotal: res.data.countMap.isQueryCrossQuotal
 
+          });
 
           if (res.data.countMap.orders > 0) {
 
             that.setData({
 
               unPayNum: res.data.countMap.unPayNum,
 
@@ -270,13 +273,18 @@ Page({
 
     }
 
   },
 
   crossBoundaryQuotaQuery() {
 
+    let that = this;
 
     let userInfo = wx.getStorageSync('userInfo');
 
     let token = wx.getStorageSync('token');
 
     if (userInfo && token) {
 
-      console.log('点击')
 
-      wx.navigateTo({
 
-        url: '/pages/ucenter/crossBoundaryQuotaQuery/crossBoundaryQuotaQuery'
 
-      })
 
+      if(that.data.curUser.idNo){
 
+        wx.navigateTo({
 
+          url: '/pages/ucenter/crossBoundaryQuotaQuery/crossBoundaryQuotaQuery'
 
+        })
 
+      }else{
 
+        util.showErrorToast('请先实名认证');
 
+        return false;
 
+      }
 
     } else {
 
       util.showErrorToast('请先登录');
 
       return false;

+ 1 - 1
wx-mall/pages/ucenter/index/index.wxml
Vedi File 

@@ -81,7 +81,7 @@
 
       <!-- </navigator> -->
 
     </view>
 
     
-    <view class="item" bindtap='crossBoundaryQuotaQuery' wx:if="{{isQueryCrossQuotal==1&&curUser.idNo&&userInfo.nickName!='点击头像登录'}}">
 
+    <view class="item" bindtap='crossBoundaryQuotaQuery' wx:if="{{isQueryCrossQuotal==1&&userInfo.nickName!='点击头像登录'}}">
 
       <!-- <navigator url="/pages/ucenter/idCard/idCard" class="a"> -->
 
       <view class="a">
 
         <image src="../../../static/images/edcx.png" class="icon"></image>

+ 1 - 1
wx-mall/project.config.json
Vedi File 

@@ -21,7 +21,7 @@
 
 		"bundle": true
 
 	},
 
 	"compileType": "miniprogram",
 
-	"libVersion": "2.9.4",
 
+	"libVersion": "2.10.0",
 
 	"appid": "wxb6b30b1b14ee502a",
 
 	"projectname": "wx-mall",
 
 	"simulatorType": "wechat",