Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

.gitignore

@@ -0,0 +1,6 @@
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+/out/

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

@@ -5,6 +5,8 @@ import com.kmall.admin.entity.*;
 import com.kmall.admin.websocket.WebSocketServer;
 import com.kmall.common.constant.JxlsXmlTemplateName;
 import com.kmall.common.utils.excel.ExcelUtil;
+import com.kmall.manager.manager.alipay.AliPayMicropayApiResult;
+import com.kmall.manager.manager.alipay.AliPayUtil;
 import com.kmall.manager.manager.wechat.WechatUtil;
 import com.kmall.manager.manager.wechat.WechatGlobalUtil;
 import com.kmall.manager.manager.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
@@ -526,7 +528,7 @@ public class OrderController {
         if (orderInfo.getOrderStatus() != Integer.parseInt(Dict.orderStatus.item_0.getItem())) {
             if (Dict.payFlag.item_cash.getItem().equals(orderInfo.getPayFlag())) {
                 //现金支付，直接修改订单状态
-                orderService.refund(orderInfo, null);
+                orderService.refund(orderInfo);
             } else if (Dict.payFlag.item_weixin.getItem().equals(orderInfo.getPayFlag())) {
                 //微信线下扫码支付
                 WechatRefundApiResult result = WechatUtil
@@ -559,6 +561,45 @@ public class OrderController {
 
                     return R.error(result.getErr_code_des());
                 }
+            }else if(Dict.payFlag.item_alipay.getItem().equals(orderInfo.getPayFlag())){
+                // 支付宝线下扫码支付
+                AliPayMicropayApiResult result = null;
+                try {
+                    result = AliPayUtil.aliTradeRefund(orderInfo.getOrderSn(),orderInfo.getActualPrice()+"",
+                            "顾客退款",orderInfo.getStoreId().toString());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                if (result.getCode().equals(AliPayUtil.AliPayTradeState.SUCC.getCode())) {
+                    orderService.refund(orderInfo, result);
+                } else {
+                    OrderRefundEntity mallOrderRefund = orderRefundService.queryObjectByOrderId(orderInfo.getId());
+                    OrderRefundEntity orderRefund = new OrderRefundEntity();
+                    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()));
+//                    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());
+                        orderRefundService.update(orderRefund);//退款记录
+                    }
+
+                    OrderExceptionRecordEntity mallOrderExceptionRecord = new OrderExceptionRecordEntity();
+                    mallOrderExceptionRecord.setUserId(Integer.parseInt(orderInfo.getUserId() + ""));
+                    mallOrderExceptionRecord.setOrderSn(orderInfo.getOrderSn());
+                    mallOrderExceptionRecord.setExceptionStatus(Dict.exceptionStatus.item_03.getItem());
+                    mallOrderExceptionRecord.setExceptionContent("退款失败" + result.getSubMsg());
+                    mallOrderExceptionRecord.setCreateTime(new Date());
+                    orderExceptionRecordService.save(mallOrderExceptionRecord);
+
+                    return R.error(result.getSubMsg());
+                }
+            } else{
+                return R.ok("退款成功");
             }
 
         }
@@ -940,7 +981,7 @@ public class OrderController {
     public R getIdCardInfo() throws IOException {
 
         Map map = new HashMap();
-        String ssl = OkHttpUtils.post(map,"http://qhdswl.f3322.net:56800/api/limit/get", "SSL");
+        String ssl = OkHttpUtils.post(map,"http://192.168.1.68:8000/idcard/read", "SSL");
         Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
         Matcher matcher = pattern.matcher(ssl);
         char ch;

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

@@ -36,6 +36,10 @@ public class ProductController {
     @RequestMapping("/list")
     @RequiresPermissions("product:list")
     public R list(@RequestParam Map<String, Object> params) {
+
+        ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
+        ParamUtils.setName(params, "categoryName");
+
         ParamUtils.setName(params, "goodsName");
         //查询列表数据
         Query query = new Query(params);

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkCenterMenuController.java

@@ -45,6 +45,10 @@ public class MkCenterMenuController {
     @RequiresPermissions("mkcentermenu:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
+
+        ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
+        ParamUtils.setName(params, "categoryName");
+
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/service/OrderService.java

@@ -7,6 +7,7 @@ import com.kmall.admin.entity.OrderEntity;
 import com.kmall.admin.entity.OrderRefundEntity;
 import com.kmall.admin.entity.WxOrderEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.manager.manager.alipay.AliPayMicropayApiResult;
 import com.kmall.manager.manager.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import com.kmall.common.utils.print.ticket.item.Ticket;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
@@ -60,11 +61,14 @@ public interface OrderService {
 
     Ticket printMsg(Long id,String sessionId);
 
+    void refund(OrderEntity orderInfo);
     /**
      * 退款
      */
     void refund(OrderEntity orderInfo, WechatRefundApiResult result);
 
+    void refund(OrderEntity orderInfo, AliPayMicropayApiResult result);
+
     /**
      * 微信国际退款逻辑处理
      * @param order

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

@@ -376,6 +376,37 @@ public class OrderServiceImpl implements OrderService {
         return TicketPrintUtil.print(head, goodsList, cashInfo, cusListing);
     }
 
+
+    /**
+     * 退款
+     */
+    @Transactional
+    public void refund(OrderEntity order) {
+        boolean needUpdateStock = true;
+        if (order.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_201.getItem())) {
+            order.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_401.getItem()));
+        }
+        if (Dict.payFlag.item_cash.getItem().equals(order.getPayFlag())) {
+            order.setPayStatus(Integer.parseInt(Dict.payStatus.item_4.getItem()));
+        }
+        orderDao.update(order);//修改为退款中
+        // TODO: 2019/6/13 定时任务查询退款成功后释放库存、优惠券
+        /*// 判断是否有优惠券
+        UserCouponEntity couponVo = userCouponDao.queryByOrderId(order.getId());
+        if (null != couponVo) {
+            userCouponDao.cancelOrder(couponVo);
+        }
+
+        if (!needUpdateStock) {
+            return;
+        }
+        // 更新库存
+        updateStock(order, "管理后台订单退款");*/
+//        updateStock(order, "管理后台订单退款");
+
+        queryStorePromRealUpdateIsScan(order);
+    }
+
     /**
      * 退款
      */
@@ -433,6 +464,62 @@ public class OrderServiceImpl implements OrderService {
         queryStorePromRealUpdateIsScan(order);
     }
 
+
+
+    @Transactional
+    public void refund(OrderEntity order, AliPayMicropayApiResult result) {
+        boolean needUpdateStock = true;
+        if (order.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_201.getItem())) {
+            order.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_401.getItem()));
+        }
+        if (Dict.payFlag.item_cash.getItem().equals(order.getPayFlag())) {
+            order.setPayStatus(Integer.parseInt(Dict.payStatus.item_4.getItem()));
+        }else{
+            order.setPayStatus(Integer.parseInt(Dict.payStatus.item_4.getItem()));
+            OrderRefundEntity mallOrderRefund = orderRefundDao.queryObjectByOrderId(order.getId());
+            OrderRefundEntity orderRefund = new OrderRefundEntity();
+            orderRefund.setRefundId(result.getTradeNo());
+            orderRefund.setOutRefundNo(result.getOutTradeNo());
+            orderRefund
+                    .setRefundMoney(new BigDecimal(result.getRefundFee()).divide(Constant.ONE_HUNDRED));
+            orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_2.getItem()));//退款处理中
+            orderRefund.setModTime(new Date());
+
+            if (mallOrderRefund != null) {
+                orderRefund.setId(mallOrderRefund.getId());
+                orderRefund.setRefundType(mallOrderRefund.getRefundType());
+                orderRefundDao.update(orderRefund);
+            } else {
+                orderRefund.setOrderId(Integer.parseInt(order.getId() + ""));
+                orderRefund.setUserId(Integer.parseInt(order.getUserId() + ""));
+                orderRefund.setCreateTime(new Date());
+                List<OrderEntity> list = orderDao.queryObjectByMerchOrderSn(order.getMerchOrderSn());
+                if(list.size()>1){//多条订单
+                    orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_2.getItem()));//部分退款
+                }else{
+                    orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));//用户全额退款
+                }
+                orderRefundDao.save(orderRefund);//退款记录
+            }
+        }
+        orderDao.update(order);//修改为退款中
+        // TODO: 2019/6/13 定时任务查询退款成功后释放库存、优惠券
+        /*// 判断是否有优惠券
+        UserCouponEntity couponVo = userCouponDao.queryByOrderId(order.getId());
+        if (null != couponVo) {
+            userCouponDao.cancelOrder(couponVo);
+        }
+
+        if (!needUpdateStock) {
+            return;
+        }
+        // 更新库存
+        updateStock(order, "管理后台订单退款");*/
+//        updateStock(order, "管理后台订单退款");
+
+//        queryStorePromRealUpdateIsScan(order);
+    }
+
     /**
      * 平安退款逻辑处理
      * @param order
@@ -1631,7 +1718,9 @@ public class OrderServiceImpl implements OrderService {
             // 微信支付
 //            wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
             // 支付宝支付
-            AliPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
+            resultObj.put("shopName",store.getStoreName()); // 根据门店编号查询
+            resultObj.put("userName",user.getUsername());
 
             // 保存订单流转表
             // 设置下单完成时间
@@ -1665,7 +1754,7 @@ public class OrderServiceImpl implements OrderService {
         return resultObj;
     }
 
-    private void AliPay(SysUserEntity user, String parCode, Map resultObj, OrderVo order, OrderProcessRecordEntity processRecordEntity, OrderWXPayRecordEntity orderWXPayRecordCurrent, StoreEntity store) throws Exception {
+    private void AliPay(SysUserEntity user, String parCode,  OrderVo order, OrderProcessRecordEntity processRecordEntity, OrderWXPayRecordEntity orderWXPayRecordCurrent, StoreEntity store) throws Exception {
 
         AliPayRequestParams params = new AliPayRequestParams();
         params.setAuthCode(parCode);
@@ -1678,8 +1767,7 @@ public class OrderServiceImpl implements OrderService {
         AliPayMicropayApiResult aliPayMicropayApiResult = AliPayUtil.aliTradePay(params);
         orderWXPayRecordService.updateRecordByAli(orderWXPayRecordCurrent.getId(), aliPayMicropayApiResult);
         LOGGER.info("调用阿里支付接口的同步返回结果："+JacksonUtils.toJson(aliPayMicropayApiResult));
-        resultObj.put("shopName",store.getStoreName()); // 根据门店编号查询
-        resultObj.put("userName",user.getUsername());
+
 
 
         // 修改订单状态

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -179,7 +179,7 @@
         left join mall_merch m on a.merch_sn = m.merch_sn
         left join mall_product c on a.product_id = c.id
         LEFT JOIN mall_category cg ON a.category_id = cg.id
-        left join mall_store s on a.store_id = s.id
+        left join mall_store s on a.store_id = s.id AND s.third_party_merch_code = b.third_party_merch_code
         WHERE 1=1 and b.is_delete = 0
         <if test="categoryId != null and categoryId != '' ">
             AND a.category_id = #{categoryId}
@@ -200,7 +200,7 @@
             AND a.merch_sn = #{merchSn}
         </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
-            AND s.third_party_merch_code = #{thirdPartyMerchCode}
+            AND b.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="goodsId != null">
             AND a.goods_id = #{goodsId}
@@ -311,7 +311,7 @@
         left join third_merchant_biz mb on mb.third_party_merch_code = b.third_party_merch_code and mb.merch_sn=b.merch_sn
         left join mall_product c on a.product_id = c.id
         LEFT JOIN mall_category cg ON a.category_id = cg.id
-        left join mall_store s on a.store_id = s.id
+        left join mall_store s on a.store_id = s.id AND s.third_party_merch_code = b.third_party_merch_code
         WHERE 1=1 and b.is_delete = 0
         <if test="storeId != null and storeId != '' ">
             AND a.store_id = #{storeId}

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

@@ -32,7 +32,7 @@
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-3 logodiv">
                     <!--center-block-->
-                    <img src="${rc.contextPath}/statics/img/logotest2.jpg" class="img-rounded img-responsive" style="height: 70px;">
+                    <img src="${rc.contextPath}/statics/img/logotest2.png" class="img-rounded img-responsive" style="height: 70px;">
                 </div>
                 <div class="col-md-9" style="background-color: #f0f0f0;margin:0px;padding: 0px" >
                     <div v-show="showList">

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

@@ -49,6 +49,14 @@
             margin: 0;
             padding: 0;
         }
+
+        .ui-jqgrid .ui-jqgrid-bdiv {
+            border-top: 1px solid #E1E1E1;
+            overflow-x: auto;
+        }
+        .frozen-div, .frozen-bdiv {
+            background-color: #E4E6E9;/*与网页背景色一致*/
+        }
     </style>
 </head>
 <body>
@@ -147,7 +155,8 @@
             </div>
         </Row>
         <table id="jqGrid"></table>
-        <div id="jqGridPager"></div>
+        <div id="jqGridPager"><div class="ui-jqgrid-bdiv frozen-div"></div></div>
+
     </div>
 
     <Card v-show="!showList">

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

@@ -17,7 +17,7 @@
             </div>
         </Row>
 	    <table id="jqGrid"></table>
-<!--	    <div id="jqGridPager"></div>-->
+	    <div id="jqGridPager"></div>
     </div>
 </div>
 

kmall-admin/src/main/webapp/js/faceid/type10ordernopay.js

@@ -21,12 +21,12 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '所属门店', name: 'storeName', index: 'storeName',align: 'center', width: 70},
-            {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 100},
-            {label: '会员', name: 'userName', index: 'user_name', align: 'center',width: 50},
+            {label: '所属门店', name: 'storeName', index: 'storeName',align: 'center', width: 230},
+            {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 200},
+            {label: '会员', name: 'userName', index: 'user_name', align: 'center',width: 80},
             // {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn',align: 'center', width: 80},
             {
-                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type',align: 'center', width: 60,
+                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type',align: 'center', width: 100,
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -41,7 +41,7 @@ $(function () {
                 }
             },
             {
-                label: '订单状态', name: 'orderStatus', index: 'order_status',align: 'center', width: 80,
+                label: '订单状态', name: 'orderStatus', index: 'order_status',align: 'center', width: 90,
                 formatter: function (value) {
                     if (value == '0') {
                         return '订单创建成功等待付款';
@@ -79,7 +79,7 @@ $(function () {
             //     }
             // },
             {
-                label: '付款状态', name: 'payStatus', index: 'pay_status',align: 'center', width: 50,
+                label: '付款状态', name: 'payStatus', index: 'pay_status',align: 'center', width: 80,
                 formatter: function (value) {
                     if (value == '0') {
                         return '未付款';
@@ -96,14 +96,14 @@ $(function () {
                 }
             },
             // {label: '实际支付', name: 'actualPrice', index: 'actual_price', align: 'center',width: 50},
-            {label: '订单总价', name: 'orderPrice', index: 'order_price', align: 'center',width: 50},
+            {label: '订单总价', name: 'orderPrice', index: 'order_price', align: 'center',width: 80},
             {
-                label: '下单时间', name: 'addTime', index: 'add_time',align: 'center', width: 95,
+                label: '下单时间', name: 'addTime', index: 'add_time',align: 'center', width: 140,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
-            {label: '是否人脸认证', name: 'isFaceCheck', index: 'isFaceCheck', align: 'center',width: 65,
+            {label: '是否人脸认证', name: 'isFaceCheck', index: 'isFaceCheck', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -115,7 +115,7 @@ $(function () {
                     return value;
                 }
             },
-            {label: '是否模板通知', name: 'isTempNoti', index: 'isTempNoti', align: 'center',width: 65,
+            {label: '是否模板通知', name: 'isTempNoti', index: 'isTempNoti', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -127,9 +127,9 @@ $(function () {
                     return value;
                 }
             },
-            {label: '人脸识别返回信息', name: 'recognitionReturnMsg', index: 'recognitionReturnMsg', align: 'center',width: 100},
-            {label: '模板通知返回信息', name: 'tempNotiMsg', index: 'tempNotiMsg', align: 'center',width: 90},
-            {label: '核验操作类型', name: 'checkOperatorType', index: 'checkOperatorType', align: 'center',width: 65,
+            {label: '人脸识别返回信息', name: 'recognitionReturnMsg', index: 'recognitionReturnMsg', align: 'center',width: 230},
+            {label: '模板通知返回信息', name: 'tempNotiMsg', index: 'tempNotiMsg', align: 'center',width: 120},
+            {label: '核验操作类型', name: 'checkOperatorType', index: 'checkOperatorType', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '1') {
                         return '人脸活体识别';
@@ -176,6 +176,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -190,7 +193,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -14,26 +14,26 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '商品', name: 'valueName', index: 'value_id', width: 80},
+            {label: '商品', name: 'valueName', index: 'value_id', width: 180},
             {label: '规格', name: 'goodsSpecificationNameValue', index: 'value_id', width: 80},
-            {label: '评价', name: 'content', index: 'content', width: 80},
+            {label: '评价', name: 'content', index: 'content', width: 180},
             {
-                label: '评论时间', name: 'addTime', index: 'add_time', width: 80, formatter: function (value) {
+                label: '评论时间', name: 'addTime', index: 'add_time',align:"center", width: 140, formatter: function (value) {
                 return transDate(value);
             }
             },
             {
-                label: '状态', name: 'status', index: 'status', width: 80, formatter: function (value) {
+                label: '状态', name: 'status', index: 'status',align:"center", width: 80, formatter: function (value) {
                 if (value === 0) {
                     return '<span class="label label-success">隐藏</span>';
                 }
                 return '<span class="label label-danger">显示</span>';
             }
             },
-            {label: '会员', name: 'userName', index: 'user_id', width: 80},
-            {label: '评价级别', name: 'evalLevel', index: 'user_id', width: 80},
-            {label: '配送质量', name: 'deliveryLevel', index: 'user_id', width: 80},
-            {label: '商品服务', name: 'goodsLevel', index: 'user_id', width: 80}],
+            {label: '会员', name: 'userName', index: 'user_id', align:"center",width: 100},
+            {label: '评价级别', name: 'evalLevel', index: 'user_id',align:"center", width: 80},
+            {label: '配送质量', name: 'deliveryLevel', index: 'user_id', align:"center",width: 80},
+            {label: '商品服务', name: 'goodsLevel', index: 'user_id',align:"center", width: 80}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -41,6 +41,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -55,7 +58,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -3,16 +3,16 @@ $(function () {
         url: '../goods/list',
         datatype: "json",
         colModel: [
-            {label: 'ID', name: 'id', index: 'id', width: 60, key: true},
+            // {label: 'ID', name: 'id', index: 'id', width: 60, key: true},
             {label: '商户名称', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 60, align: 'center'},
-            {label: '商品编码', name: 'goodsSn', index: 'goods_Sn', width: 60, align: 'center'},
-            {label: 'SKU', name: 'sku', index: 'sku', width: 80, align: 'center'},
-            {label: '产品条码', name: 'prodBarcode', index: 'prod_barcode', width: 60, align: 'center'},
+            {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 160, align: 'center'},
+            {label: '商品编码', name: 'goodsSn', index: 'goods_Sn', width: 180, align: 'center'},
+            {label: 'SKU', name: 'sku', index: 'sku', width: 180, align: 'center'},
+            {label: '产品条码', name: 'prodBarcode', index: 'prod_barcode', width: 160, align: 'center'},
             // {label: '商品类型', name: 'categoryName', index: 'category_id', width: 40, align: 'center'},
-            {label: '名称', name: 'name', index: 'name', width: 160, align: 'center'},
+            {label: '名称', name: 'name', index: 'name', width: 260, align: 'left'},
             {
-                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 70, align: 'center',
+                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 100, align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -24,7 +24,7 @@ $(function () {
                     return '普通货物';
                 }
             },
-            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 80, align: 'center',
+            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 100, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -33,17 +33,17 @@ $(function () {
                     }
                     return '-';
                 }},
-            {label: '商品库存', name: 'goodsNumber', index: 'goodsNumber', width: 80, align: 'center'},
+            {label: '商品库存', name: 'goodsNumber', index: 'goodsNumber', width: 100, align: 'right'},
             // {label: '零售价格', name: 'retailPrice', index: 'retail_price', width: 80, align: 'center'},
             // {label: '市场价', name: 'marketPrice', index: 'market_price', width: 80, align: 'center'},
             {
-                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 40, align: 'center',
+                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 50, align: 'center',
                 formatter: function (value) {
                     return transIsNot(value);
                 }
             },
             {
-                label: '热销', name: 'isHot', index: 'is_hot', width: 80, formatter: function (value) {
+                label: '热销', name: 'isHot', index: 'is_hot', width: 50, align: 'center',formatter: function (value) {
                 return transIsNot(value);
             }
             },
@@ -58,19 +58,22 @@ $(function () {
                 }
             },*/
             {
-                label: '录入日期', name: 'addTime', index: 'add_time', width: 80, align: 'center',
+                label: '录入日期', name: 'addTime', index: 'add_time', width: 200, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             }
         ],
         viewrecords: true,
-        height: 575,
+        height: 475,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1600,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -85,7 +88,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
     $('#goodsDesc').editable({

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

@@ -4,7 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '变动类型', name: 'changeType', index: 'change_type', width: 70, align: 'center',
+            {label: '变动类型', name: 'changeType', index: 'change_type', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '还原';
@@ -20,14 +20,14 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '变动原因', name: 'changeReason', index: 'change_reason', width: 90, align: 'center'},
-			{label: '商品库存变化数', name: 'changeNum', index: 'change_num', width: 70, align: 'center'},
-			{label: '商品原库存数', name: 'originalNum', index: 'original_num', width: 65, align: 'center'},
-			{label: '商品库存可用数', name: 'validNum', index: 'valid_num', width: 70, align: 'center'},
-			{label: '所属商户', name: 'merchName', index: 'merchName', width: 70, align: 'center'},
-			{label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'third_party_merch_code', width: 70, align: 'center'},
-            {label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 70, align: 'center'},
-            {label: '所属商品', name: 'goodsName', index: 'goodsName', width: 140, align: 'center'},
+            {label: '变动原因', name: 'changeReason', index: 'change_reason', width: 150},
+			{label: '商品库存变化数', name: 'changeNum', index: 'change_num', width: 100, align: 'center'},
+			{label: '商品原库存数', name: 'originalNum', index: 'original_num', width: 80, align: 'center'},
+			{label: '商品库存可用数', name: 'validNum', index: 'valid_num', width: 100, align: 'center'},
+			{label: '所属商户', name: 'merchName', index: 'merchName', width: 80, align: 'center'},
+			{label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'third_party_merch_code', width: 140, align: 'center'},
+            {label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 140, align: 'center'},
+            {label: '所属商品', name: 'goodsName', index: 'goodsName', width: 180},
             // {label: '是否有效', name: 'isValid', index: 'is_valid', width: 50, align: 'center',
             //     formatter: function (value) {
             //         if (value == '0') {
@@ -38,12 +38,12 @@ $(function () {
             //         return '-';
             //     }
             // },
-			{label: '创建人', name: 'createrSn', index: 'creater_sn', width: 75, align: 'center'},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 90, align: 'center', formatter: function (value) {
+			{label: '创建人', name: 'createrSn', index: 'creater_sn', width: 120, align: 'center'},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 140, align: 'center', formatter: function (value) {
                 return transDate(value,'yyyy-MM-dd hh:mm:ss');
             }},
-			{label: '修改人', name: 'moderSn', index: 'moder_sn', width: 75, align: 'center'},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 90, align: 'center', formatter: function (value) {
+			{label: '修改人', name: 'moderSn', index: 'moder_sn', width: 120, align: 'center'},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 140, align: 'center', formatter: function (value) {
                 return transDate(value,'yyyy-MM-dd hh:mm:ss');
             }}],
 		viewrecords: true,
@@ -53,6 +53,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -67,7 +70,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -21,7 +21,7 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 100},
+            {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '操作店员', name: 'userName', index: 'user_name', align: 'center',width: 80},
             {
                 label: '购买类型', name: 'isOnfflineOrder', index: 'is_onffline_order', align: 'center',width: 80,
@@ -35,7 +35,7 @@ $(function () {
                 }
             },
             {
-                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type', align: 'center',width: 80,
+                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type', align: 'center',width: 130,
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -50,7 +50,7 @@ $(function () {
                 }
             },
             {
-                label: '订单状态', name: 'orderStatus', index: 'order_status', align: 'center',width: 80,
+                label: '订单状态', name: 'orderStatus', index: 'order_status', align: 'center',width: 180,
                 formatter: function (value) {
                     if (value == '0') {
                         return '订单创建成功等待付款';
@@ -94,16 +94,16 @@ $(function () {
             // {label: '收货人', name: 'consignee', index: 'consignee', width: 80},
             // {label: '收货地址', name: 'address', index: 'address', width: 80},
             // {label: '联系电话', name: 'mobile', index: 'mobile', width: 80},
-            {label: '实际支付', name: 'actualPrice', index: 'actual_price', align: 'center',width: 60},
-            {label: '订单总价', name: 'orderPrice', index: 'order_price',align: 'center', width: 60},
+            {label: '实际支付', name: 'actualPrice', index: 'actual_price', align: 'center',width: 80},
+            {label: '订单总价', name: 'orderPrice', index: 'order_price',align: 'center', width: 80},
             {
-                label: '下单时间', name: 'addTime', index: 'add_time', width: 120,align: 'center',
+                label: '下单时间', name: 'addTime', index: 'add_time', width: 140,align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
             {
-                label: '付款时间', name: 'payTime', index: 'pay_time', width: 120, align: 'center',
+                label: '付款时间', name: 'payTime', index: 'pay_time', width: 140, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
@@ -136,6 +136,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -150,7 +153,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });
@@ -378,20 +381,22 @@ let vm = new Vue({
             let params = {};
             params.orderId = rowId;
 
-            $.ajax({
-                type: "POST",
-                url: '../order/offilineRefund',
-                data: params,
-                success: function (r) {
-                    if (r.code === 0) {
-                        alert('退款成功', function (index) {
-                            vm.reload();
-                        });
-                    } else {
-                        alert(r.msg);
+            confirm("确认退款吗？",function () {
+                $.ajax({
+                    type: "POST",
+                    url: '../order/offilineRefund',
+                    data: params,
+                    success: function (r) {
+                        if (r.code === 0) {
+                            alert('退款成功', function (index) {
+                                vm.reload();
+                            });
+                        } else {
+                            alert(r.msg);
+                        }
                     }
-                }
-            });
+                });
+            })
         },
         shippingBind: function (event) {
             let orderId = vm.order.id;
@@ -426,19 +431,21 @@ let vm = new Vue({
             let params = {};
             params.orderId = rowId;
 
-            $.ajax({
-                type: "POST",
-                url: '../order/cancel',
-                data: params,
-                success: function (r) {
-                    if (r.code === 0) {
-                        alert('取消成功', function (index) {
-                            vm.reload();
-                        });
-                    } else {
-                        alert(r.msg);
+            confirm("是否取消订单？",function(){
+                $.ajax({
+                    type: "POST",
+                    url: '../order/cancel',
+                    data: params,
+                    success: function (r) {
+                        if (r.code === 0) {
+                            alert('取消成功', function (index) {
+                                vm.reload();
+                            });
+                        } else {
+                            alert(r.msg);
+                        }
                     }
-                }
+                });
             });
         }
     },
@@ -596,4 +603,4 @@ let vm = new Vue({
     }
     var removePrintArea = function (id) {
         $("iframe#" + id).remove();
-    };
+    };

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

@@ -41,10 +41,10 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80},
-            {label: '订单号', name: 'orderSn', index: 'order_sn', width: 100},
-            {label: '会员', name: 'userName', index: 'user_name', width: 80},
-            {label: '支付类型', name: 'isMergePay', index: 'is_merge_pay', width: 60,
+            {label: '所属门店', name: 'storeName', index: 'storeName',align: 'center', width: 180},
+            {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 180},
+            {label: '会员', name: 'userName', index: 'user_name',align: 'center', width: 80},
+            {label: '支付类型', name: 'isMergePay', index: 'is_merge_pay',align: 'center', width: 80,
                 formatter: function (value) {
                     if (value == '2') {
                         return '合并支付';
@@ -56,9 +56,9 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn', width: 140},
+            {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn', align: 'center',width: 150},
             {
-                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type', width: 80,
+                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -73,7 +73,7 @@ $(function () {
                 }
             },
             {
-                label: '订单状态', name: 'orderStatus', index: 'order_status', width: 80,
+                label: '订单状态', name: 'orderStatus', index: 'order_status', align: 'center',width: 120,
                 formatter: function (value) {
                     if (value == '0') {
                         return '订单创建成功等待付款';
@@ -98,7 +98,7 @@ $(function () {
                 }
             },
             {
-                label: '订付人核验', name: 'buyerPayCheck', index: 'buyer_pay_check', width: 80,
+                label: '订付人核验', name: 'buyerPayCheck', index: 'buyer_pay_check', align: 'center',width: 80,
                 formatter: function (value) {//订购人支付人校验，0:未知，1:一致，2:不一致,3:校验异常
                     if (value == '0') {
                         return '未知';
@@ -111,7 +111,7 @@ $(function () {
                 }
             },
             {
-                label: '付款状态', name: 'payStatus', index: 'pay_status', width: 80,
+                label: '付款状态', name: 'payStatus', index: 'pay_status', align: 'center',width: 80,
                 formatter: function (value) {
                     if (value == '0') {
                         return '未付款';
@@ -130,19 +130,19 @@ $(function () {
             // {label: '收货人', name: 'consignee', index: 'consignee', width: 80},
             // {label: '收货地址', name: 'address', index: 'address', width: 80},
             // {label: '联系电话', name: 'mobile', index: 'mobile', width: 80},
-            {label: '实际支付', name: 'actualPrice', index: 'actual_price', width: 60},
-            {label: '订单总价', name: 'orderPrice', index: 'order_price', width: 60},
+            {label: '实际支付', name: 'actualPrice', index: 'actual_price', align: 'right',width: 80},
+            {label: '订单总价', name: 'orderPrice', index: 'order_price', align: 'right',width: 80},
             {
-                label: '下单时间', name: 'addTime', index: 'add_time', width: 120,
+                label: '下单时间', name: 'addTime', index: 'add_time',align: 'center', width: 160,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
-            {label: '快递公司', name: 'shippingName', index: 'shipping_name', width: 80},
-            {label: '配送单号', name: 'shippingNo', index: 'shipping_No', width: 80},
+            {label: '快递公司', name: 'shippingName', index: 'shipping_name', align: 'center',width: 80},
+            {label: '配送单号', name: 'shippingNo', index: 'shipping_No',align: 'center', width: 180},
             {label: '快递费用', name: 'shippingFee', index: 'shipping_fee', width: 80},
             {
-                label: '发货状态', name: 'shippingStatus', index: 'shipping_status', width: 60,
+                label: '发货状态', name: 'shippingStatus', index: 'shipping_status', align: 'center',width: 80,
                 formatter: function (value) {
                     if (value == '0') {
                         return '未发货';
@@ -156,9 +156,9 @@ $(function () {
                     return value;
                 }
             },
-            {label: '修改人', name: 'moderSn', index: 'moderSn', width: 80},
+            {label: '修改人', name: 'moderSn', index: 'moderSn', align: 'center',width: 80},
             {
-                label: '操作', width: 180, sortable: false,
+                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.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
                     //订单状态： 0订单创建成功等待付款，　101订单已取消，　102订单已删除，201订单已付款，等待发货，300订单已发货， 301用户确认收货，401 没有发货，退款　402 已收货，退款退货
@@ -188,6 +188,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -202,7 +205,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -13,18 +13,18 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn', width: 120},
-			{label: '用户名称', name: 'userName', index: 'username', width: 80},
-			{label: '商户退款单号', name: 'outRefundNo', index: 'out_refund_no', width: 80},
+			{label: '订单编号', name: 'orderSn', index: 'order_sn',width: 220},
+			{label: '用户名称', name: 'userName', index: 'username', align: 'center' , width: 80},
+			{label: '商户退款单号', name: 'outRefundNo', index: 'out_refund_no', align: 'center' , width: 180},
             {
-                label: '申请时间', name: 'createTime', index: 'create_time', width: 100,
+                label: '申请时间', name: 'createTime', index: 'create_time',  align: 'center' ,width: 140,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
 			{label: '微信退款单号', name: 'refundId', index: 'refund_id', width: 80, hidden: true},
 			{
-			    label: '退款类型', name: 'refundType', index: 'refund_type', width: 80,
+			    label: '退款类型', name: 'refundType', index: 'refund_type', width: 180,
                 formatter: function (value) {
                     if (value == '1') {
                         return '用户全额退款';
@@ -35,14 +35,14 @@ $(function () {
                 }
             },
 			{
-			    label: '退款时间', name: 'refundTime', index: 'refund_time', width: 100,
+			    label: '退款时间', name: 'refundTime', index: 'refund_time',  align: 'center' ,width: 140,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
 			{label: '退款金额', name: 'refundMoney', index: 'refund_money', width: 80, align: 'right'},
 			{
-			    label: '退款状态', name: 'refundStatus', index: 'refund_status', width: 80,
+			    label: '退款状态', name: 'refundStatus', index: 'refund_status', align: 'center' , width: 120,
                 formatter: function (value) {
                     if (value == '1') {
                         return '申请中';
@@ -59,18 +59,18 @@ $(function () {
                 }
             },
 			{label: '退款原因', name: 'refundReason', index: 'refund_reason', width: 140},
-            {label: '退款操作人', name: 'moderSn', index: 'moderSn', width: 80},
+            {label: '退款操作人', name: 'moderSn', index: 'moderSn', width: 90},
 			{label: '退款入账账户', name: 'refundRecvAccout', index: 'refund_recv_accout', width: 80, hidden: true},
 			{label: '审核人', name: 'approver', index: 'approver', width: 80},
 			{
-			    label: '审核时间', name: 'approvalTime', index: 'approval_time', width: 100,
+			    label: '审核时间', name: 'approvalTime', index: 'approval_time',  align: 'center' ,width: 140,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
 			{label: '审核备注', name: 'approvalRemark', index: 'approval_remark', width: 80},
             {
-                label: '操作', width: 180, sortable: false,
+                label: '操作', width: 130, sortable: false, align: 'center' ,
                 formatter: function (value, col, row) {
                     let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
                     if (hasPermission('order:refund')) {
@@ -87,12 +87,15 @@ $(function () {
                 }
             }],
 		viewrecords: true,
-        height: 645,
+        height: '100%',
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -107,7 +110,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -6,14 +6,14 @@ $(function () {
         colModel: [
 			{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},
-            {label: '商户名称', name: 'merchName', index: 'merchName', width: 70},
-            {label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 70},
-            {label: '商户下单时间', name: 'placeOrderlTimeStr', index: 'placeOrderlTimeStr', width: 80},
+			{label: '商户订单编号', name: 'merchOrderId', index: 'merchOrderId',width: 180},
+			{label: '商户子订单编号', name: 'orderSn', index: 'orderSn',width: 250},
+            {label: '商户编号', name: 'merchSn', index: 'merchSn', align: 'center',width: 220},
+            {label: '商户名称', name: 'merchName', index: 'merchName', align: 'center',width: 170},
+            {label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', align: 'center',width: 100},
+            {label: '商户下单时间', name: 'placeOrderlTimeStr', index: 'placeOrderlTimeStr', align: 'center',width: 180},
             {label: '实际支付金额', name: 'acturalPaid', index: 'acturalPaid', width: 80, hidden: true},
-            {label: '订购人支付人核验', name: 'buyerPayCheck', index: 'buyerPayCheck', width: 80,
+            {label: '订购人支付人核验', name: 'buyerPayCheck', index: 'buyerPayCheck', align: 'center',width: 120,
                 formatter: function (value) {
                     if (value == '0') {
                         return '未知';
@@ -25,7 +25,7 @@ $(function () {
                     return '-';
                 }
             },
-			{label: '电子订单发送状态', name: 'clecOrderStatus', index: 'clecOrderStatus', width: 80,
+			{label: '电子订单发送状态', name: 'clecOrderStatus', index: 'clecOrderStatus',align: 'center', width: 120,
                 formatter: function (value) {
                     if (value == '0') {
                         return '待发送';
@@ -39,7 +39,7 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '运单发送状态', name: 'wayOrderStatus', index: 'wayOrderStatus', width: 70,
+            {label: '运单发送状态', name: 'wayOrderStatus', index: 'wayOrderStatus', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '0') {
                         return '待发送';
@@ -53,7 +53,7 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '核验发送状态', name: 'projectCheckStatus', index: 'projectCheckStatus', width: 70,
+            {label: '核验发送状态', name: 'projectCheckStatus', index: 'projectCheckStatus',align: 'center', width: 100,
                 formatter: function (value) {
                     if (value == '0') {
                         return '待发送';
@@ -67,7 +67,7 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '支付单发送状态', name: 'playOrderStatus', index: 'playOrderStatus', width: 80,
+            {label: '支付单发送状态', name: 'playOrderStatus', index: 'playOrderStatus',align: 'center', width: 120,
                 formatter: function (value) {
                     if (value == '0') {
                         return '待发送';
@@ -81,8 +81,8 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '失败原因', name: 'failMsg', index: 'failMsg', width: 100},
-            {label: '操作', width: 180, sortable: false,align: 'center',
+            {label: '失败原因', name: 'failMsg', index: 'failMsg',width: 450},
+            {label: '操作', width: 230, sortable: false,align: 'center',
                 formatter: function (value, col, row) {
                     let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail('+row.wxOrderId+')"><i class="fa fa-info-circle"></i>失败原因</button>&nbsp;';
 
@@ -106,10 +106,13 @@ $(function () {
 		viewrecords: true,
         height: 645,
         rowNum: 999,
-        // rowList: [200, 300, 500],
+        rowList: [200, 300, 500],
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -124,7 +127,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -6,11 +6,11 @@ $(function () {
         colModel: [
             {label: 'ID', name: 'id', index: 'id', hidden: true, key: true},
             {label: '商品商户编号', name: 'goods_merch_sn', index: 'goods_merch_sn', hidden: true},
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 70, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 70, align: 'center'},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 100, align: 'center'},
             {label: '商品类型', name: 'categoryName', index: 'categoryName', width: 80, align: 'center'},
             {
-                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 70, align: 'center',
+                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 90, align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -22,9 +22,9 @@ $(function () {
                     return '普通货物';
                 }
             },
-            {label: '商品编码', name: 'goodsSn', index: 'goodsSn', width: 70, align: 'center'},
-            {label: '名称', name: 'goodsName', index: 'goodsName', width: 160, align: 'left'},
-            {label: '产品编码', name: 'productSn', index: 'productSn', width: 70, align: 'center'},
+            {label: '商品编码', name: 'goodsSn', index: 'goodsSn', width: 180, align: 'center'},
+            {label: '名称', name: 'goodsName', index: 'goodsName', width: 260, align: 'left'},
+            {label: '产品编码', name: 'productSn', index: 'productSn', width: 100, align: 'center'},
             {
                 label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 40, align: 'center',
                 formatter: function (value) {
@@ -37,7 +37,7 @@ $(function () {
                     return transIsNot(value);
                 }
             },
-            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 70, align: 'center',
+            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 90, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -47,8 +47,8 @@ $(function () {
                     return '-';
                 }},
             {label: '门店库存', name: 'stockNum', index: 'stockNum', width: 70, align: 'center'},
-            {label: '零售价格', name: 'retailPrice', index: 'retailPrice', width: 60, align: 'center'},
-            {label: '市场价', name: 'marketPrice', index: 'marketPrice', width: 60, align: 'center'},
+            {label: '零售价格', name: 'retailPrice', index: 'retailPrice', width: 70, align: 'right'},
+            {label: '市场价', name: 'marketPrice', index: 'marketPrice', width: 60, align: 'right'},
             // {label: '库存价格', name: 'stockPrice', index: 'stockPrice', width: 80},
             {
                 label: '销售量',
@@ -62,7 +62,7 @@ $(function () {
                 }
             },
             {
-                label: '操作', width: 120, align: 'center', sortable: false, formatter: function (value, col, row) {
+                label: '操作', width: 220, align: 'center', sortable: false, formatter: function (value, col, row) {
                 let htmlStr = '';
                 if (row.goodsBizType == '02' || row.goodsBizType == '10') {
                     htmlStr = "<button class='btn btn-outline btn-primary' " +
@@ -85,6 +85,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -99,7 +102,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
     $('#goodsDesc').editable({

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

@@ -4,7 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '变动类型', name: 'changeType', index: 'change_type', width: 60,
+            {label: '变动类型', name: 'changeType', index: 'change_type', width: 160,
                 formatter: function (value) {
                     if (value == '0') {
                         return '还原';
@@ -18,15 +18,15 @@ $(function () {
                         return '更新库存减少';
                     }
                     return '-';
-                }, align: 'center'
+                }
             },
-            {label: '变动原因', name: 'changeReason', index: 'change_reason', width: 90, align: 'center'},
-			{label: '门店库存变化数', name: 'storeChangeNum', index: 'store_change_num', width: 70, align: 'center'},
-			{label: '门店原库存数', name: 'storeOriginalNum', index: 'store_original_num', width: 65, align: 'center'},
-			{label: '门店库存可用数', name: 'storeValidNum', index: 'store_valid_num', width: 70, align: 'center'},
-			{label: '所属商户', name: 'merchName', index: 'merchName', width: 70, align: 'center'},
-			{label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-			{label: '所属商品', name: 'goodsName', index: 'goodsName', width: 140, align: 'center'},
+            {label: '变动原因', name: 'changeReason', index: 'change_reason', width: 180},
+			{label: '门店库存变化数', name: 'storeChangeNum', index: 'store_change_num', width: 100, align: 'center'},
+			{label: '门店原库存数', name: 'storeOriginalNum', index: 'store_original_num', width: 100, align: 'center'},
+			{label: '门店库存可用数', name: 'storeValidNum', index: 'store_valid_num', width: 100, align: 'center'},
+			{label: '所属商户', name: 'merchName', index: 'merchName', width: 140, align: 'center'},
+			{label: '所属门店', name: 'storeName', index: 'storeName', width: 180},
+			{label: '所属商品', name: 'goodsName', index: 'goodsName', width: 180, align: 'left'},
             // {label: '是否有效', name: 'isValid', index: 'is_valid', width: 60, align: 'center',
             //     formatter: function (value) {
             //         if (value == '0') {
@@ -37,12 +37,12 @@ $(function () {
             //         return '-';
             //     }
             // },
-			{label: '创建人', name: 'createrSn', index: 'creater_sn', width: 75, align: 'center'},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 90, align: 'center', formatter: function (value) {
+			{label: '创建人', name: 'createrSn', index: 'creater_sn', width: 80, align: 'center'},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 140, align: 'center', formatter: function (value) {
                 return transDate(value,'yyyy-MM-dd hh:mm:ss');
             }},
-			{label: '修改人', name: 'moderSn', index: 'moder_sn', width: 75, align: 'center'},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 90, align: 'center', formatter: function (value) {
+			{label: '修改人', name: 'moderSn', index: 'moder_sn', width: 80, align: 'center'},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 140, align: 'center', formatter: function (value) {
                 return transDate(value,'yyyy-MM-dd hh:mm:ss');
             }}],
 		viewrecords: true,
@@ -52,6 +52,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -66,7 +69,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });