1.修改前端样式问题

2.登录时写死机器码

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

@@ -131,6 +131,8 @@ public class OrderServiceImpl implements OrderService {
     @Autowired
     private CashierLoginRecordDao cashierLoginRecordDao; // 收银员登录记录
     @Autowired
+    private SaleRecordDao saleRecordDao; // 销售记录
+    @Autowired
     private StoreTopicDao storeTopicDao; // 查询是否有门店活动
     @Autowired
     private Mk2GoodsTopicPriceDao mk2GoodsTopicPriceDao; // 门店商品价格
@@ -1838,7 +1840,8 @@ public class OrderServiceImpl implements OrderService {
                 saleRecordEntity.setSallerId(userId+"");
                 saleRecordEntity.setSalesTime(new Date());
                 saleRecordEntity.setDiscountId(topicId + "");
-
+                saleRecordEntity.setCreateTime(new Date());
+                saleRecordDao.save(saleRecordEntity);
             }
 
             // 查询积分规则 ,默认先按消费金额1:1积分

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

@@ -364,6 +364,9 @@
         <if test="sku != null and sku.trim() != ''">
             AND gs.sku = #{sku}
         </if>
+        <if test="prodBarcode != null and prodBarcode.trim() != ''">
+            AND gs.prod_barcode = #{prodBarcode}
+        </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
@@ -408,17 +411,20 @@
         </if>
     </select>
     <select id="queryOffilineOrderList" resultType="com.kmall.admin.entity.OrderEntity">
-        SELECT
+        SELECT distinct
         o.*,
         u.username AS username,
         p.is_payment_send,
         p.is_ele_order_send,
-        p.is_customs_send
+        p.is_customs_send,
+        s.store_name storeName
         FROM
         mall_order o
         LEFT JOIN sys_user u ON o.user_id = u.user_id
         LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
+        LEFT JOIN mall_order_goods g ON o.id = g.order_id
         left join mall_store s on o.store_id = s.id
+        LEFT JOIN mall_goods gs ON g.goods_id = gs.id
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}
@@ -426,6 +432,12 @@
         <if test="merchSn != null and merchSn.trim() != ''">
             AND o.merch_sn = #{merchSn}
         </if>
+        <if test="sku != null and sku.trim() != ''">
+            AND gs.sku = #{sku}
+        </if>
+        <if test="prodBarcode != null and prodBarcode.trim() != ''">
+            AND gs.prod_barcode = #{prodBarcode}
+        </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>

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

@@ -12,7 +12,7 @@
                 <i-col span="4">
                     <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
                 </i-col>
-                <i-button @click="query">查询1</i-button>
+                <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">

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

@@ -31,8 +31,8 @@
             <Form-item label="活动名称" prop="topicName">
                 <i-input v-model="mk2MemberBirthday.topicName" placeholder="活动名称"/>
             </Form-item>
-            <Form-item label="优惠类型 00.按比例  10.按金额" prop="topicType">
-                <i-input v-model="mk2MemberBirthday.topicType" placeholder="优惠类型 00.按比例  10.按金额"/>
+            <Form-item label="优惠类型" prop="topicType">
+                <i-input v-model="mk2MemberBirthday.topicType" placeholder="优惠类型"/>
             </Form-item>
             <Form-item label="优惠金额" prop="topicPrice">
                 <i-input v-model="mk2MemberBirthday.topicPrice" placeholder="优惠金额"/>

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

@@ -16,11 +16,11 @@
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
-            <div class="buttons-group">
+            <!--<div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-            </div>
+            </div>-->
         </Row>
 	    <table id="jqGrid"></table>
 	    <div id="jqGridPager"></div>

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

@@ -16,7 +16,6 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

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

@@ -27,7 +27,6 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

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

@@ -5,7 +5,7 @@ $(function () {
         colModel: [
 			{label: 'mmbId', name: 'mmbId', index: 'mmb_id', key: true, hidden: true},
 			{label: '活动名称', name: 'topicName', index: 'topic_name', width: 280},
-			{label: '优惠类型 00.按比例  10.按金额', name: 'topicType', index: 'topic_type', width: 180,align: 'center',
+			{label: '优惠类型', name: 'topicType', index: 'topic_type', width: 180,align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '按比例';
@@ -165,4 +165,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

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

@@ -35,7 +35,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

@@ -212,12 +212,12 @@ $(function () {
 
 
     $("#salesJqGrid").jqGrid({
-        url: '../order/list',
+        url: '../order/offilineOrderList',
         datatype: "json",
         colModel: [
             {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: 'consignee', index: 'consignee',align: 'center', width: 80},
             {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn', align: 'center',width: 150},
             {
                 label: '订单状态', name: 'orderStatus', index: 'order_status', align: 'center',width: 120,

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

@@ -120,7 +120,7 @@ let vm = new Vue({
         submitOrder:function(){
             $('#payCode').unbind('keydown').keydown(function(event){});
             vm.machineCode = sessionStorage.getItem("machineCode");
-
+            console.log(vm.machineCode);
             var param = {'userInfo':vm.userInfo,'payCode':this.$refs.payCode.currentValue,'goodsList':vm.goodsList,'sessionId':vm.sessionId,'machineCode':vm.machineCode};
             this.$refs.payCode.currentValue = '';
             $.ajax({

kmall-admin/src/main/webapp/login.html

@@ -119,14 +119,17 @@
         beforeMount: function(){
             // TODO 调用接口获取机器码
             console.log("获取机器码");
-            this.machineCode = "1";
+            this.machineCode = "MxMmJQvK+KQ=";
+            this.machineCode = this.machineCode.replace("+","%2B");
+            sessionStorage.setItem("machineCode",this.machineCode);
         },
         methods: {
             refreshCode: function () {
                 this.src = "captcha.jpg?t=" + $.now();
             },
             login: function (event) {
-                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode //TODO  新增加一个机器码;
+                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode; //TODO  新增加一个机器码;
+                console.log(vm.machineCode);
                 sessionStorage.removeItem("permsSet");
                 $.ajax({
                     type: "POST",