修改判断

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -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());

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

@@ -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);
     }
 

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -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({
             });
         }
 	}
-});
+});

wx-mall/pages/index/index.js

@@ -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();
   }
-})
+})

wx-mall/pages/ucenter/index/index.js

@@ -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;

wx-mall/pages/ucenter/index/index.wxml

@@ -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>

wx-mall/project.config.json

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