修改页面样式

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

@@ -30,6 +30,7 @@ public class CashierLoginRecordEntity implements Serializable {
      * 门店编号
      */
     private String shopSn;
+    private String shopName;
     /**
      * 登录时间
      */
@@ -185,4 +186,12 @@ public class CashierLoginRecordEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysLoginController.java

@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -75,6 +77,9 @@ public class SysLoginController {
     @ResponseBody
     @RequestMapping(value = "/sys/login", method = RequestMethod.POST)
     public R login(String username, String password, String captcha,String machineCode ,HttpSession session) throws IOException {
+
+
+
         String kaptcha = (String) JedisUtil.get(Constants.KAPTCHA_SESSION_KEY);
         LOGGER.info("获取验证码："+kaptcha);
         System.out.println(kaptcha);

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

@@ -59,8 +59,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1627,6 +1629,11 @@ public class OrderServiceImpl implements OrderService {
         String sessionId = (String) param.get("sessionId");
         // machineCode
         String machineCode = (String) param.get("machineCode");
+        try {
+            machineCode = URLDecoder.decode(machineCode,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
         Map resultObj = Maps.newHashMap();
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/Mk2GoodsTopicPriceServiceImpl.java

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl.mk;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.Maps;
 import com.kmall.admin.dao.GoodsDao;
+import com.kmall.admin.dao.ThirdMerchantBizDao;
 import com.kmall.admin.dao.mk.Mk2GoodsTopicHistoryPriceDao;
 import com.kmall.admin.dao.mk.store.StoreTopicDao;
 import com.kmall.admin.dto.StoreGoodsDto;
@@ -50,6 +51,8 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
     private StoreTopicDao storeTopicDao;
     @Autowired
     private Mk2GoodsTopicHistoryPriceDao goodsTopicHistoryPriceDao;
+    @Autowired
+    private ThirdMerchantBizDao thirdMerchantBizDao;
 
     @Override
     public Mk2GoodsTopicPriceEntity queryObject(Integer mgthpId) {
@@ -117,6 +120,14 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                 }
                 // 1.保存门店活动
                 if(storeTopicEntity == null){
+                    String merchSn = storeTopicGoodsDto.getMerchSn();
+                    List<ThirdMerchantBizEntity> byMerchSn = thirdMerchantBizDao.findByMerchSn(merchSn);
+                    if(byMerchSn != null && byMerchSn.size() > 0){
+                        ThirdMerchantBizEntity thirdMerchantBizEntity = byMerchSn.get(0);
+                        storeTopicEntity.setThirdMerchSn(thirdMerchantBizEntity.getThirdMerchSn());
+                    }else{
+                        throw new RuntimeException("没有该第三方商户");
+                    }
                     storeTopicEntity = new StoreTopicEntity();
                     storeTopicEntity.setTitle(storeTopicGoodsDto.getTopic()); // 主题
                     storeTopicEntity.setContent(storeTopicGoodsDto.getTopicContent()); // 内容
@@ -126,6 +137,7 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                     storeTopicEntity.setStoreId(Integer.parseInt(storeTopicGoodsDto.getShopSn()));
                     storeTopicEntity.setIsValid("0");
                     storeTopicDao.save(storeTopicEntity);
+
                 }
 
                 // 根据sku查询商品

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

@@ -40,19 +40,19 @@
 
 	<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`
+    		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
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">

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

@@ -34,17 +34,19 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.CashierLoginRecordEntity">
 		select
-    		`mclr_id`,
-    		`saller_id`,
-    		`cashier_id`,
-    		`shop_sn`,
-    		`login_time`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall2_cashier_login_record
+    		record.mclr_id,
+    		record.saller_id,
+    		record.cashier_id,
+    		record.shop_sn,
+    		record.login_time,
+    		record.creater_sn,
+    		record.create_time,
+    		record.moder_sn,
+    		record.mod_time,
+    		record.tstm,
+    		store.store_name as shopName
+		from mall2_cashier_login_record record
+		left join mall_store store on record.shop_sn = store.store_number
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -37,18 +37,18 @@
             <Form-item label="收银机编号" prop="cashierSn">
                 <i-input v-model="cashier.cashierSn" placeholder="收银机编号"/>
             </Form-item>
-            <Form-item label="站点编码" prop="stationCode">
+          <!--  <Form-item label="站点编码" prop="stationCode">
                 <i-input v-model="cashier.stationCode" placeholder="站点编码"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item label="门店编号" prop="shopSn">
                 <i-input v-model="cashier.shopSn" placeholder="门店编号"/>
             </Form-item>
             <Form-item label="商户编号" prop="merchSn">
                 <i-input v-model="cashier.merchSn" placeholder="商户编号"/>
             </Form-item>
-            <Form-item label="第三方商户编号" prop="thirdMerchSn">
+           <!-- <Form-item label="第三方商户编号" prop="thirdMerchSn">
                 <i-input v-model="cashier.thirdMerchSn" placeholder="第三方商户编号"/>
-            </Form-item>
+            </Form-item>-->
 
 
             <Form-item>

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

@@ -104,22 +104,22 @@
         <Row>
             <i-col span="4">
                 <Form-item label="商品名称" prop="name">
-                    <i-input v-model="goods.name" placeholder="商品名称"/>
+                    <i-input readOnly="readonly" v-model="goods.name" placeholder="商品名称"/>
                 </Form-item>
             </i-col>
             <i-col span="4">
                 <Form-item label="商品简称" prop="name">
-                    <i-input v-model="goods.name" placeholder="商品简称"/>
+                    <i-input readOnly="readonly" v-model="goods.name" placeholder="商品简称"/>
                 </Form-item>
             </i-col>
             <i-col span="4">
                 <Form-item label="规格" prop="ciqProdModel">
-                    <i-input v-model="goods.ciqProdModel" placeholder="规格"/>
+                    <i-input readOnly="readonly" v-model="goods.ciqProdModel" placeholder="规格"/>
                 </Form-item>
             </i-col>
             <i-col span="4">
                 <Form-item label="基本单位" prop="goodsUnit">
-                    <i-input v-model="goods.goodsUnit" placeholder="基本单位"/>
+                    <i-input readOnly="readonly" v-model="goods.goodsUnit" placeholder="基本单位"/>
                 </Form-item>
             </i-col>
         </Row>
@@ -127,24 +127,24 @@
                 <i-col span="4">
                     <Form-item label="品类" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="品类"/>-->
-                        <i-input  placeholder="品类"/>
+                        <i-input  readOnly="readonly" placeholder="品类"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="部门" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="部门"/>-->
-                        <i-input placeholder="部门"/>
+                        <i-input readOnly="readonly" placeholder="部门"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="品牌厅" prop="brand">
-                        <i-input v-model="goods.brand" placeholder="品牌厅"/>
+                        <i-input readOnly="readonly" v-model="goods.brand" placeholder="品牌厅"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="进货单位" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="进货单位"/>-->
-                        <i-input  placeholder="进货单位"/>
+                        <i-input  readOnly="readonly" placeholder="进货单位"/>
                     </Form-item>
                 </i-col>
             </Row>
@@ -152,26 +152,26 @@
                 <i-col span="4">
                     <Form-item label="主供应商" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="主供应商"/>-->
-                        <i-input  placeholder="主供应商"/>
+                        <i-input  readOnly="readonly" placeholder="主供应商"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="商品U级" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="商品U级"/>-->
-                        <i-input  placeholder="商品U级"/>
+                        <i-input  readOnly="readonly" placeholder="商品U级"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="包装含量" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="包装含量"/>-->
-                        <i-input placeholder="包装含量"/>
+                        <i-input readOnly="readonly" placeholder="包装含量"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="产地" prop="goodsSn">
-                        <i-select v-model="goods.oriCntCode" filterable placeholder="原产国"
+                        <i-select disabled="disabled" v-model="goods.oriCntCode" filterable placeholder="原产国"
                                   label-in-value>
-                            <i-option v-for="cusNationCode in cusNationCodeList" :value="cusNationCode.code" :key="cusNationCode.sn">{{cusNationCode.name}}</i-option>
+                            <i-option   v-for="cusNationCode in cusNationCodeList" :value="cusNationCode.code" :key="cusNationCode.sn">{{cusNationCode.name}}</i-option>
                         </i-select>
 <!--                        <i-input v-model="goods.goodsSn" placeholder="产地"/>-->
                     </Form-item>
@@ -180,23 +180,23 @@
             <Row>
                 <i-col span="4">
                     <Form-item label="主条码" prop="prodBarcode">
-                        <i-input v-model="goods.prodBarcode" placeholder="主条码"/>
+                        <i-input readOnly="readonly" v-model="goods.prodBarcode" placeholder="主条码"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="PLU编码" prop="sku">
                         <!--<i-input v-model="goods.sku" placeholder="PLU编码"/>-->
-                        <i-input  placeholder="PLU编码"/>
+                        <i-input  readOnly="readonly" placeholder="PLU编码"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="编码" prop="sku">
-                        <i-input v-model="goods.sku" placeholder="编码"/>
+                        <i-input readOnly="readonly" v-model="goods.sku" placeholder="编码"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
                     <Form-item label="品牌" prop="brand">
-                        <i-input v-model="goods.brand" placeholder="品牌"/>
+                        <i-input readOnly="readonly" v-model="goods.brand" placeholder="品牌"/>
                     </Form-item>
                 </i-col>
             </Row>
@@ -227,7 +227,7 @@
         </i-form>
         <div style="padding-left: 20px">
             <!--<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>-->
-            <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+<!--            <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>-->
             <!--<i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>-->
         </div>
     </Card>

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

@@ -30,8 +30,8 @@
                     </select>
 
                     <button v-on:click="refresh">刷新</button>
-                    <button v-on:click="">保存条件</button>
-                    <button v-on:click="">清除条件</button>
+                    <button v-on:click="saveFlushTime">保存条件</button>
+                    <button v-on:click="clearFlushTime">清除条件</button>
                     |
                 <!--</div>-->
                 <!--<div class="col-md-3 selectDiv">-->
@@ -93,4 +93,4 @@
     </script>
 </div>
 </body>
-</html>
+</html>

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

@@ -4,10 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mclrId', name: 'mclrId', index: 'mclr_id', key: true, hidden: true},
-			{label: '店员id', name: 'sallerId', index: 'saller_id', width: 80},
-			{label: '收银机id', name: 'cashierId', index: 'cashier_id', width: 80},
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
-			{label: '登录时间', name: 'loginTime', index: 'login_time', width: 80}
+			{label: '店员用户名', name: 'sallerId', index: 'saller_id',align: 'center', width: 80},
+			{label: '收银机id', name: 'cashierId', index: 'cashier_id',align: 'center', width: 80},
+			{label: '门店名称', name: 'shopName', index: 'shopName',align: 'center', width: 80},
+			{label: '登录时间', name: 'loginTime', index: 'login_time',align: 'center', width: 80,formatter:function(value){
+					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+				}}
 			],
 		viewrecords: true,
         height: 550,
@@ -16,7 +18,6 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

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

@@ -4,13 +4,15 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mcId', name: 'mcId', index: 'mc_id', key: true, hidden: true},
-			{label: '机器码类型', name: 'machineCodeType', index: 'machine_code_type', width: 80},
-			{label: '机器码', name: 'machineCode', index: 'machine_code', width: 80},
-			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn', width: 80},
-			{label: '站点编码', name: 'stationCode', index: 'station_code', width: 80},
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
-			{label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80},
-			{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80}
+			{label: '机器码类型', name: 'machineCodeType', index: 'machine_code_type',align:'center', width: 80},
+			{label: '机器码', name: 'machineCode', index: 'machine_code',align:'center', width: 80},
+			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align:'center', width: 80},
+			/*{label: '站点编码', name: 'stationCode', index: 'station_code', width: 80},*/
+			{label: '门店编号', name: 'shopSn', index: 'shop_sn',align:'center', width: 80},
+			{label: '门店名称', name: 'shopName', index: 'shopName',align:'center', width: 80},
+			{label: '商户编号', name: 'merchSn', index: 'merch_sn',align:'center', width: 80},
+			{label: '商户名称', name: 'merchName', index: 'merchName',align:'center', width: 80}
+			/*{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80}*/
 			],
 		viewrecords: true,
         height: 550,

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

@@ -4,11 +4,18 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'msrId', name: 'msrId', index: 'msr_id', key: true, hidden: true},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn', width: 80},
-			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn', width: 80},
-			{label: '店员id', name: 'sallerId', index: 'saller_id', width: 80},
-			{label: '活动id', name: 'discountId', index: 'discount_id', width: 80},
-			{label: '销售时间', name: 'salesTime', index: 'sales_time', width: 80}
+			{label: '订单编号', name: 'orderSn', index: 'order_sn',align: 'center', width: 80},
+			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align: 'center', width: 80},
+			{label: '店员id', name: 'sallerId', index: 'saller_id',align: 'center', width: 80},
+			{label: '活动id', name: 'discountId', index: 'discount_id', align: 'center', width: 80,formatter:function(value){
+				console.log(typeof value);
+				if(value === '0'){
+					return '-';
+				}
+				}},
+			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 80,formatter:function(value){
+					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+				}}
 			],
 		viewrecords: true,
         height: 550,

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

@@ -62,22 +62,22 @@ let vm = new Vue({
         refreshTime: 10,
         type: 'store',
         // sales : [{
-            storeId: '',
-            merchSn: '',
-            merchName: '',
-            storeName: '',
-            salesDate: '',
-            totalSales: '',
-            actualSales: '',
-            preferentialLoss: '',
-            totalCost: '',
-            grossProfit: '',
-            grossProfitRatio: '',
-            proportion: '',
-            guestNumber: '',
-            guestUnitPrice: '',
-            lastSalesTime: '',
-            showList:false
+        storeId: '',
+        merchSn: '',
+        merchName: '',
+        storeName: '',
+        salesDate: '',
+        totalSales: '',
+        actualSales: '',
+        preferentialLoss: '',
+        totalCost: '',
+        grossProfit: '',
+        grossProfitRatio: '',
+        proportion: '',
+        guestNumber: '',
+        guestUnitPrice: '',
+        lastSalesTime: '',
+        showList:false
         // }]
 ,
         compareDate: '',//比较日期
@@ -96,6 +96,7 @@ let vm = new Vue({
         guestNumber2: '',
         guestUnitPrice2: '',
         lastSalesTime2: '',
+        intervalId:0,
 
         rateList: [
             {
@@ -231,6 +232,9 @@ let vm = new Vue({
                     console.log(r);
                     r = r.page.list[0];
                     console.log(r);
+                    if(r.storeId == null){
+                        alert("该门店"+vm.compareDate+"无销售记录");
+                        return;}
 
                     vm.storeId2 = r.storeId;
                     vm.merchSn2 = r.merchSn;
@@ -276,6 +280,14 @@ let vm = new Vue({
             });
 
         },
+        saveFlushTime:function(){
+            console.log(typeof vm.refreshTime);
+            vm.intervalId = window.setInterval('vm.refresh()',vm.refreshTime*1000)
+        },
+        clearFlushTime:function(){
+            window.clearInterval(vm.intervalId);
+            vm.intervalId = 0;
+        },
         seriesTypeSwitch: function(){
             console.log('vm.seriesTypeSelect');
             console.log(vm.seriesTypeSelect);
@@ -360,4 +372,4 @@ let vm = new Vue({
 //             data: vm.guestUnitPrice
 //         }
 //     ]
-// };
+// };

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

@@ -4,11 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mmcrId', name: 'mmcrId', index: 'mmcr_id', key: true, hidden: true},
-			{label: '用户id', name: 'userId', index: 'user_id', width: 80},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn', width: 80},
-			{label: '消费时间', name: 'consumptionTime', index: 'consumption_time', width: 80},
-			{label: '消费门店id', name: 'shopSn', index: 'shop_sn', width: 80},
-			{label: '是否使用生日优惠', name: 'isUseBirthdayOffer', index: 'is_use_birthday_offer', width: 80},
+			{label: '用户id', name: 'userId', index: 'user_id',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: 'isUseBirthdayOffer', index: 'is_use_birthday_offer',align:'center', width: 80},
 			],
 		viewrecords: true,
         height: 550,

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

@@ -3,10 +3,12 @@ $(function () {
         url: '../mall2memberpoints/list',
         datatype: "json",
         colModel: [
-			{label: 'mmpId', name: 'mmpId', index: 'mmp_id', key: true, hidden: true},
-			{label: '用户id', name: 'userId', index: 'user_id', width: 80},
-			{label: '积分数', name: 'points', index: 'points', width: 80},
-			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date', width: 80},
+			{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: 'points', index: 'points',align:'center', width: 80},
+			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date',align:'center', width: 80,formatter:function(value){
+				return '-';
+				}},
 			],
 		viewrecords: true,
         height: 550,