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

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

@@ -21,36 +21,45 @@
         <result property="categoryName" column="categoryName"/>
 
         <result column="sku" property="sku" jdbcType="VARCHAR" />
-        <result column="goods_biz_type" property="goodsBizType" jdbcType="CHAR" />
-        <result column="creater_sn" property="createrSn" jdbcType="VARCHAR" />
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-        <result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
-        <result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
-        <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
+        <result column="goods_biz_type" property="goodsBizType" />
+        <result column="creater_sn" property="createrSn" />
+        <result column="create_time" property="createTime" />
+        <result column="moder_sn" property="moderSn" />
+        <result column="mod_time" property="modTime" />
+        <result column="tstm" property="tstm" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.ProductStoreRelaEntity">
-		select
-			a.`id`,
-			a.`store_id`,
-			a.`product_id`,
-			a.`stock_num`,
-			a.`goods_id`,
-			a.`retail_price`,
-			a.`market_price`,
-			a.`stock_price`,
-			a.`sell_volume`,
-			a.sku,a.goods_biz_type, a.creater_sn, a.create_time, a.moder_sn, a.mod_time, a.tstm,
-			b.goods_sn goodsSn,
-			c.goods_sn productSn,
-			b.name goodsName,
-            cg.name categoryName,
-            s.store_name storeName
-		from mall_product_store_rela a
-		left join mall_goods b on a.goods_id = b.id
-		left join mall_product c on a.product_id = c.id
-        LEFT JOIN mall_category cg ON b.category_id = cg.id
-        left join mall_store s on a.store_id = s.id
+		SELECT
+            a.`id`,
+            a.`store_id`,
+            a.`product_id`,
+            a.`stock_num`,
+            a.`goods_id`,
+            a.`retail_price`,
+            a.`market_price`,
+            a.`stock_price`,
+            a.`sell_volume`,
+            a.sku,
+            a.goods_biz_type,
+            a.creater_sn,
+            a.create_time,
+            a.moder_sn,
+            a.mod_time,
+            a.tstm,
+            b.goods_sn goodsSn,
+            c.goods_sn productSn,
+            b.NAME goodsName,
+            cg.NAME categoryName,
+            s.store_name storeName,
+            gs.value as specification
+        FROM
+            mall_product_store_rela a
+            LEFT JOIN mall_goods b ON a.goods_id = b.id
+            LEFT JOIN mall_product c ON a.product_id = c.id
+            LEFT JOIN mall_category cg ON b.category_id = cg.id
+            LEFT JOIN mall_store s ON a.store_id = s.id
+            left join mall_goods_specification gs on gs.goods_id = a.goods_id
 		where a.id = #{id}
 	</select>
 

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

@@ -192,17 +192,18 @@
         <p slot="title" style="height: auto">{{title}}</p>
         <Tabs>
             <Tab-Pane label="订单信息" name="name1">
-                <i-form ref="formValidate" :model="order" :label-width="80">
+                <i-form ref="formValidate" :model="order" :label-width="100">
                     <Form-item label="订单号" prop="orderSn">
                         <i-input v-model="order.orderSn" readonly/>
                     </Form-item>
                     <Form-item label="会员" prop="userName">
                         <i-input v-model="order.userName" readonly/>
                     </Form-item>
-                    <Form-item label="订单类型" prop="orderType">
-                        <i-select v-model="order.orderType" disabled>
-                            <i-option value="1">普通订单</i-option>
-                            <i-option value="2">团购订单</i-option>
+                    <Form-item label="订单业务类型" prop="orderBizType" >
+                        <i-select v-model="order.orderBizType" filterable placeholder="订单业务类型"
+                                  label-in-value disabled>
+                            <i-option v-for="macro in macros" :value="macro.value" :key="macro.id">{{macro.name}}
+                            </i-option>
                         </i-select>
                     </Form-item>
                     <Form-item label="订单状态" prop="orderStatus" readonly>

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

@@ -46,12 +46,15 @@
             <Form-item label="微信退款单号" prop="refundId">
                 <i-input v-model="orderRefund.refundId" placeholder="微信退款单号" readonly/>
             </Form-item>
-            <Form-item label="退款类型" prop="refundType" >
-                <i-select v-model="orderRefund.refundType" filterable placeholder="退款类型"
-                          label-in-value style="width: 240px;">
-                    <i-option v-for="refundType in refundTypeList" :value="refundType.value" :key="refundType.id">{{refundType.name}}
-                    </i-option>
-                </i-select>
+            <Form-item label="退款类型" prop="refundType" readonly>
+                <Radio-group v-model="orderRefund.refundType">
+                    <Radio label="1" disabled>
+                        <span>用户全额退款</span>
+                    </Radio>
+                    <Radio label="2" disabled>
+                        <span>系统部分退款</span>
+                    </Radio>
+                </Radio-group>
             </Form-item>
             <Form-item label="退款时间" prop="refundTime">
                 <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderRefund.refundTime" placeholder="退款时间" readonly style="width: 240px;"/>
@@ -60,28 +63,52 @@
                 <i-input v-model="orderRefund.refundMoney" placeholder="退款金额" readonly style="width: 240px;"/>
             </Form-item>
             <Form-item label="退款状态" prop="refundStatus">
-                <i-select v-model="orderRefund.refundStatus" filterable placeholder="退款状态"
-                          label-in-value style="width: 240px;">
-                    <i-option v-for="refundStatus in refundStatusList" :value="refundStatus.value" :key="refundStatus.id">{{refundStatus.name}}
-                    </i-option>
-                </i-select>
+                <Radio-group v-model="orderRefund.refundStatus">
+                    <Radio label="1" disabled>
+                        <span>申请中</span>
+                    </Radio>
+                    <Radio label="2" disabled>
+                        <span>退款成功</span>
+                    </Radio>
+                    <Radio label="3" disabled>
+                        <span>已拒绝</span>
+                    </Radio>
+                </Radio-group>
             </Form-item>
             <Form-item label="退款原因" prop="refundReason">
                 <i-input v-model="orderRefund.refundReason" placeholder="退款原因" readonly/>
             </Form-item>
             <Form-item label="退款入账账户" prop="refundRecvAccout">
-                <i-select v-model="orderRefund.refundRecvAccout" filterable placeholder="退款入账账户"
-                          label-in-value>
-                    <i-option v-for="refundRecvAccout in refundRecvAccoutList" :value="refundRecvAccout.value" :key="refundRecvAccout.id">{{refundRecvAccout.name}}
-                    </i-option>
-                </i-select>
+                <Radio-group v-model="orderRefund.refundRecvAccout">
+                    <Radio label="1" disabled>
+                        <span>退回银行卡</span>
+                    </Radio>
+                    <Radio label="2" disabled>
+                        <span>退回支付用户零钱</span>
+                    </Radio>
+                    <Radio label="3" disabled>
+                        <span>退还商户</span>
+                    </Radio>
+                    <Radio label="4" disabled>
+                        <span>退回支付用户零钱通</span>
+                    </Radio>
+                </Radio-group>
             </Form-item>
             <Form-item label="微信退款状态" prop="wechatRefundStatusDes">
-                <i-select v-model="orderRefund.wechatRefundStatusDes" filterable placeholder="微信退款状态"
-                          label-in-value style="width: 240px;">
-                    <i-option v-for="wechatRefundStatusDes in wechatRefundStatusDesList" :value="wechatRefundStatusDes.value" :key="wechatRefundStatusDes.id">{{wechatRefundStatusDes.name}}
-                    </i-option>
-                </i-select>
+                <Radio-group v-model="orderRefund.refundRecvAccout">
+                    <Radio label="SUCCESS" disabled>
+                        <span>退款成功</span>
+                    </Radio>
+                    <Radio label="REFUNDCLOSE" disabled>
+                        <span>退款关闭</span>
+                    </Radio>
+                    <Radio label="PROCESSING" disabled>
+                        <span>退款处理中</span>
+                    </Radio>
+                    <Radio label="CHANGE" disabled>
+                        <span>退款异常</span>
+                    </Radio>
+                </Radio-group>
             </Form-item>
             <Form-item label="审核人" prop="approver">
                 <i-input v-model="orderRefund.approver" placeholder="审核人" readonly style="width: 240px;"/>

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

@@ -111,7 +111,7 @@ $(function () {
                     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 已收货，退款退货
                     if (hasPermission('order:refund')) {
-                        if (row.orderStatus == 201) {
+                        if (row.orderStatus == 300 && (row.orderBizType == '10' || row.orderBizType == '02')) {
                             htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
                         }
                         if (row.orderStatus == 201 || row.orderStatus == 301 || row.orderStatus == 300) {
@@ -167,6 +167,7 @@ let vm = new Vue({
             logisticCode: '',
             shipperCode: ''
         },
+        macros: [],
         orderProcessRecordEntity: {},
         orderGoodsList: []
     },
@@ -174,6 +175,11 @@ let vm = new Vue({
         query: function () {
             vm.reload(1);
         },
+        getMacro: function () {
+            $.get("../sys/macro/queryMacrosByValue?value=goodsBizType", function (r) {
+                vm.macros = r.list;
+            });
+        },
         getLogistics: function (event) {
             let id = getSelectedRow();
             if (id == null) {
@@ -293,6 +299,7 @@ let vm = new Vue({
                 vm.order = r.order;
                 vm.orderGoodsList = r.order.orderGoodsEntityList;
             });
+            vm.getMacro();
         },
         printDetail: function (rowId) {
             openWindow({

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

@@ -107,11 +107,7 @@ var vm = new Vue({
 		},
 		q: {
             userName: ''
-		},
-        refundStatusList: [],
-        refundTypeList:[],
-        wechatRefundStatusDesList: [],
-        refundRecvAccoutList: []
+		}
 	},
 	methods: {
 		query: function () {
@@ -122,26 +118,6 @@ var vm = new Vue({
 			vm.title = "新增";
 			vm.orderRefund = {};
 		},
-        getRefundStatusList: function () {
-            $.get("../sys/macro/queryMacrosByValue?value=refundStatus", function (r) {
-                vm.refundStatusList = r.list;
-            });
-        },
-        getRefundTypeList: function () {
-            $.get("../sys/macro/queryMacrosByValue?value=refundType", function (r) {
-                vm.refundTypeList = r.list;
-            });
-        },
-        getWechatRefundStatusDesList: function () {
-            $.get("../sys/macro/queryMacrosByValue?value=wechatRefundStatusDes", function (r) {
-                vm.wechatRefundStatusDesList = r.list;
-            });
-        },
-        getRefundRecvAccoutList: function () {
-            $.get("../sys/macro/queryMacrosByValue?value=refundRecvAccout", function (r) {
-                vm.refundRecvAccoutList = r.list;
-            });
-        },
 		update: function (event) {
             let id = getSelectedRow();
 			if (id == null) {
@@ -252,12 +228,8 @@ var vm = new Vue({
             vm.showList = 1;
             vm.title = "维权订单详情";
             $.get("../orderrefund/info/" + rowId, function (r) {
-                vm.orderRefund = r.orderRefund;alert(vm.orderRefund.refundType);
+                vm.orderRefund = r.orderRefund;
             });
-            vm.getRefundStatusList();
-            vm.getRefundTypeList();
-            vm.getWechatRefundStatusDesList();
-            vm.getRefundRecvAccoutList();
         }
 	}
 });

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

@@ -150,6 +150,7 @@ var vm = new Vue({
             vm.productStoreRela = { stockNum: '', retailPrice: '', marketPrice: '' };
             vm.getMacro();
             vm.getGoods();
+            vm.showInput = false;
         },
         update: function (event) {
             var id = getSelectedRow();
@@ -162,6 +163,10 @@ var vm = new Vue({
             vm.getInfo(id);
             vm.getMacro();
             vm.getGoods();
+            vm.showInput = false;
+            if (vm.productStoreRela.goodsBizType == 11) {
+                vm.showInput = true;
+            }
         },
         /**
          * 获取单位