Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/entity/CashierEntity.java

@@ -38,10 +38,12 @@ public class CashierEntity implements Serializable {
      * 门店编号
      */
     private String shopSn;
+    private String shopName;
     /**
      * 商户编号
      */
     private String merchSn;
+    private String merchName;
     /**
      * 第三方商户编号
      */
@@ -236,4 +238,20 @@ public class CashierEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getMerchName() {
+        return merchName;
+    }
+
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/SaleRecordEntity.java

@@ -34,6 +34,7 @@ public class SaleRecordEntity implements Serializable {
      * 活动id
      */
     private String discountId;
+    private String discountName;
     /**
      * 销售时间
      */
@@ -202,4 +203,12 @@ public class SaleRecordEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getDiscountName() {
+        return discountName;
+    }
+
+    public void setDiscountName(String discountName) {
+        this.discountName = discountName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/vip/Mall2MemberConsumptionRecordsEntity.java

@@ -22,6 +22,7 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
      * 用户id
      */
     private String userId;
+    private String userName;
     /**
      * 订单编号
      */
@@ -34,6 +35,7 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
      * 消费门店id
      */
     private String shopSn;
+    private String shopName;
     /**
      * 是否使用生日优惠
      */
@@ -202,4 +204,20 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/vip/Mall2MemberPointsEntity.java

@@ -22,6 +22,7 @@ public class Mall2MemberPointsEntity implements Serializable {
      * 用户id
      */
     private String userId;
+    private String userName;
     /**
      * 积分数
      */
@@ -168,4 +169,12 @@ public class Mall2MemberPointsEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

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

@@ -148,6 +148,8 @@ public class OrderServiceImpl implements OrderService {
     private MkStorePromTypeDao storePromTypeDao; // 优惠类型
     @Autowired
     private Mk2MemberBirthdayDao memberBirthdayDao; // 生日优惠
+    @Autowired
+    private MerchUserDao merchUserDao;
 
     @Override
     public OrderEntity queryObject(Long id) {
@@ -1720,6 +1722,14 @@ public class OrderServiceImpl implements OrderService {
                 userEntity.setLastLoginTime(new Date());
                 userEntity.setIdNo((String) userInfo.get("customIDCard"));
                 userDao.save(userEntity);
+
+                MerchUserEntity merchUserEntity = new MerchUserEntity();
+                merchUserEntity.setMerchSn(user.getMerchSn());
+                merchUserEntity.setStoreId(storeId);
+                merchUserEntity.setUserId(userEntity.getId());
+                merchUserEntity.setCreateTime(new Date());
+                merchUserEntity.setIsLoadGoods("0");
+                merchUserDao.save(merchUserEntity);
             }
 
 
@@ -1745,6 +1755,7 @@ public class OrderServiceImpl implements OrderService {
                     }
                     goodsEntity.setStoreRetailPrice(goodsTopicPriceEntity.getTopicPrice());
                 }
+                topicId = storeTopic.getId();
 
             }else{
                 disCountAmount = getDisCountAmout(goodsEntities);

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

@@ -40,20 +40,24 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.CashierEntity">
 		select
-    		mc_id,
-    		machine_code_type,
-    		machine_code,
-    		cashier_sn,
-    		station_code,
-    		shop_sn,
-    		merch_sn,
-    		third_merch_sn,
-    		creater_sn,
-    		create_time,
-    		moder_sn,
-    		mod_time,
-    		tstm
-		from mall2_cashier
+    		cashier.mc_id,
+    		cashier.machine_code_type,
+    		cashier.machine_code,
+    		cashier.cashier_sn,
+    		cashier.station_code,
+    		cashier.shop_sn,
+    		cashier.merch_sn,
+    		cashier.third_merch_sn,
+    		cashier.creater_sn,
+    		cashier.create_time,
+    		cashier.moder_sn,
+    		cashier.mod_time,
+    		cashier.tstm,
+    		store.store_name as shopName,
+			merch.merch_name as merchName
+		from mall2_cashier cashier
+		left join mall_store store on cashier.shop_sn = store.store_number
+		left join mall_merch merch on cashier.merch_sn = merch.merch_sn
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -251,12 +251,14 @@
         select
         mall_goods.*,
         case when mall_goods_group.id > 0 then 2 else 0 end as goodsType,
-        m.merch_name merchName, mb.is_stock_share isStockShare
+        m.merch_name merchName, mb.is_stock_share isStockShare,
+        catagory.keywords as categoryName
         from mall_goods
         left join mall_merch m on mall_goods.merch_sn = m.merch_sn
         left join mall_goods_group on mall_goods_group.goods_id = mall_goods.id and mall_goods_group.open_status != 3
         left join third_merchant_biz mb on mb.third_party_merch_code = mall_goods.third_party_merch_code and
         mb.merch_sn=mall_goods.merch_sn
+        left join mall_category catagory on catagory.id = mall_goods.category_id
         WHERE 1=1
         <!--  数据过滤  -->
         ${filterSql}

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

@@ -36,18 +36,20 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.SaleRecordEntity">
 		select
-    		`msr_id`,
-    		`order_sn`,
-    		`cashier_sn`,
-    		`saller_id`,
-    		`discount_id`,
-    		`sales_time`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall_sale_record
+    		record.msr_id,
+    		record.order_sn,
+    		record.cashier_sn,
+    		record.saller_id,
+    		record.discount_id,
+    		record.sales_time,
+    		record.creater_sn,
+    		record.create_time,
+    		record.moder_sn,
+    		record.mod_time,
+    		record.tstm,
+    		topic.title as discountName
+		from mall_sale_record record
+		left join mall_store_topic topic on topic.id = record.discount_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2MemberConsumptionRecordsDao.xml

@@ -36,18 +36,22 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.vip.Mall2MemberConsumptionRecordsEntity">
 		select
-    		`mmcr_id`,
-    		`user_id`,
-    		`order_sn`,
-    		`consumption_time`,
-    		`shop_sn`,
-    		`is_use_birthday_offer`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall2_member_consumption_records
+    		records.mmcr_id,
+    		records.user_id,
+    		records.order_sn,
+    		records.consumption_time,
+    		records.shop_sn,
+    		records.is_use_birthday_offer,
+    		records.creater_sn,
+    		records.create_time,
+    		records.moder_sn,
+    		records.mod_time,
+    		records.tstm,
+			mu.username as userName,
+			store.store_name as shopName
+		from mall2_member_consumption_records records
+		left join mall_user mu on mu.id = records.user_id
+		left join mall_store store on store.id = records.shop_sn
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2MemberPointsDao.xml

@@ -32,16 +32,18 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.vip.Mall2MemberPointsEntity">
 		select
-    		`mmp_id`,
-    		`user_id`,
-    		`points`,
-    		`points_expire_date`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall2_member_points
+    		points.mmp_id,
+    		points.user_id,
+    		points.points,
+    		points.points_expire_date,
+    		points.creater_sn,
+    		points.create_time,
+    		points.moder_sn,
+    		points.mod_time,
+    		points.tstm,
+			mu.username as userName
+		from mall2_member_points points
+		left join mall_user mu  on points.user_id = mu.id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -14,6 +14,7 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
+                <span>门店活动由“门店商品价格管理”导入</span>
 
             </div>
             <!--<div class="buttons-group">

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

@@ -127,7 +127,7 @@
                 <i-col span="4">
                     <Form-item label="品类" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="品类"/>-->
-                        <i-input  readOnly="readonly" placeholder="品类"/>
+                        <i-input  readOnly="readonly" v-model="goods.categoryName" placeholder="品类"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
@@ -142,9 +142,9 @@
                     </Form-item>
                 </i-col>
                 <i-col span="4">
-                    <Form-item label="进货单位" prop="goodsSn">
+                    <Form-item label="进货单位" prop="goodsUnit">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="进货单位"/>-->
-                        <i-input  readOnly="readonly" placeholder="进货单位"/>
+                        <i-input  readOnly="readonly" v-model="goods.goodsUnit" placeholder="进货单位"/>
                     </Form-item>
                 </i-col>
             </Row>

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

@@ -46,7 +46,7 @@
             </div>
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-12 ">
-                    门店：<input v-model="storeId" /> {{storeName}}&nbsp;&nbsp;
+                    门店id：<input v-model="storeId" /> {{storeName}}&nbsp;&nbsp;
                     业态：
                     <!--业态下拉框-->
                     <select name="formatsSelect" v-model="formatsSelect">

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

@@ -21,21 +21,21 @@
                 #if($shiro.hasPermission("user:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 #end-->
-                #if($shiro.hasPermission("user:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
-                #if($shiro.hasPermission("user:export"))
-                <i-button type="info" @click="exportUser"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
-                #end
-                #if($shiro.hasPermission("shop:usercoupon"))
-                <i-button type="primary" @click="coupon"><i class="fa fa-cc-visa"></i>&nbsp;优惠券</i-button>
-                #end
-                #if($shiro.hasPermission("shop:cart"))
-                <i-button type="primary" @click="shopCart"><i class="fa fa-shopping-cart"></i>&nbsp;购物车</i-button>
-                #end
-                #if($shiro.hasPermission("shop:address"))
-                <i-button type="primary" @click="address"><i class="fa fa-map"></i>&nbsp;收货地址</i-button>
-                #end
+<!--                #if($shiro.hasPermission("user:delete"))-->
+<!--                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("user:export"))-->
+<!--                <i-button type="info" @click="exportUser"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:usercoupon"))-->
+<!--                <i-button type="primary" @click="coupon"><i class="fa fa-cc-visa"></i>&nbsp;优惠券</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:cart"))-->
+<!--                <i-button type="primary" @click="shopCart"><i class="fa fa-shopping-cart"></i>&nbsp;购物车</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:address"))-->
+<!--                <i-button type="primary" @click="address"><i class="fa fa-map"></i>&nbsp;收货地址</i-button>-->
+<!--                #end-->
             </div>
         </Row>
         <table id="jqGrid"></table>
@@ -110,4 +110,4 @@
 
 <script src="${rc.contextPath}/js/shop/shopuser.js?_${date.systemTime}"></script>
 </body>
-</html>
+</html>

kmall-admin/src/main/webapp/js/cashier/salerecord.js

@@ -12,7 +12,9 @@ $(function () {
 				if(value === '0'){
 					return '-';
 				}
+				return value;
 				}},
+			{label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 80,},
 			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 80,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}

kmall-admin/src/main/webapp/js/mk/storetopic.js

@@ -4,16 +4,16 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '活动主题', name: 'title', index: 'title', align: 'center',width: 80},
-			{label: '活动内容', name: 'content', index: 'content',align: 'center', width: 80},
+			{label: '活动主题', name: 'title', index: 'title', align: 'center',width: 200},
+			{label: '活动内容', name: 'content', index: 'content',align: 'center', width: 200},
 			// {label: '活动图片', name: 'itemPicUrl', index: 'item_pic_url', width: 80},
-			{label: '子标题', name: 'subtitle', index: 'subtitle', align: 'center',width: 80},
-			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id',align: 'center', width: 80},
+			{label: '子标题', name: 'subtitle', index: 'subtitle', align: 'center',width: 200},
+			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id',align: 'center', width: 200},
 			// {label: '活动价格', name: 'priceInfo', index: 'price_info', width: 80},
 			// {label: '场景图片链接', name: 'scenePicUrl', index: 'scene_pic_url', width: 80},
-			{label: '门店名称', name: 'storeName', index: 'store_id', align: 'center',width: 80},
-			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn',align: 'center', width: 80},
-            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 50, align: 'center',
+			{label: '门店名称', name: 'storeName', index: 'store_id', align: 'center',width: 200},
+			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn',align: 'center', width: 200},
+            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -23,7 +23,7 @@ $(function () {
                     return '-';
                 }
             },
-			{label: '备注', name: 'note', index: 'note', width: 80},
+			{label: '备注', name: 'note', index: 'note', width: 200},
 			],
 		viewrecords: true,
         height: 550,

kmall-admin/src/main/webapp/js/receipt/receiptCheck.js

@@ -21,6 +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: 120},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '操作店员', name: 'userName', index: 'user_name', align: 'center',width: 80},
             {
@@ -60,27 +61,8 @@ $(function () {
                 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: 'shippingFee', index: 'shipping_fee', width: 80},
-            {
-                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;';
-                    if (row.orderStatus == 201 && (row.orderBizType == '11')) {
-                        htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 0) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 201) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
-                    }
-
-                    return htmlStr;
-                }
             }
+
         ],
         viewrecords: true,
         height: 675,
@@ -92,7 +74,6 @@ $(function () {
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
         width: 1500,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

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

@@ -446,6 +446,7 @@ var vm = new Vue({
             $.post("../goods/infoByQuery",postData,function(r){
 
                 vm.goods = r.goods;
+                console.log(r.goods);
                 // vm.goodsBizType = r.goods.goodsBizType;
             });
             // $.get("../goods/info/" + id, function (r) {

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

@@ -3,7 +3,7 @@ $(function () {
         url: '../goodshistoryprice/list',
         datatype: "json",
         colModel: [
-			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: 'id', name: 'id', index: 'id', key: true, width: 50,hidden: true},
 			{label: '商品编码(sku)', name: 'sku', index: 'sku', width: 180},
 			{label: 'PLU', name: 'plu', index: 'plu', width: 180,align: 'center',formatter: function (value) {
 				if(!value){
@@ -26,7 +26,6 @@ $(function () {
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
         width: 1500,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -153,4 +152,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/vip/mall2memberconsumptionrecords.js

@@ -5,11 +5,13 @@ $(function () {
         colModel: [
 			{label: 'mmcrId', name: 'mmcrId', index: 'mmcr_id', key: true, hidden: true},
 			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
+			{label: '用户名称', name: 'userName', index: 'userName',align:'center', width: 80},
 			{label: '订单编号', name: 'orderSn', index: 'order_sn',align:'center', width: 80},
 			{label: '消费时间', name: 'consumptionTime', index: 'consumption_time',align:'center', width: 80,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
 			{label: '消费门店id', name: 'shopSn', index: 'shop_sn',align:'center', width: 80},
+			{label: '消费门店', name: 'shopName', index: 'shopName',align:'center', width: 80},
 			{label: '是否使用生日优惠', name: 'isUseBirthdayOffer', index: 'is_use_birthday_offer',align:'center', width: 80},
 			],
 		viewrecords: true,

kmall-admin/src/main/webapp/js/vip/mall2memberpoints.js

@@ -5,6 +5,7 @@ $(function () {
         colModel: [
 			{label: 'mmpId', name: 'mmpId', index: 'mmp_id',align:'center', key: true, hidden: true},
 			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
+			{label: '用户名', name: 'userName', index: 'userName',align:'center', width: 80},
 			{label: '积分数', name: 'points', index: 'points',align:'center', width: 80},
 			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date',align:'center', width: 80,formatter:function(value){
 				return '-';