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

.gitignore

@@ -4,3 +4,4 @@
 *.iml
 *.ipr
 /out/
+*/target/

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

@@ -94,8 +94,15 @@ public class GoodsProductController {
     @RequiresPermissions("goodsproduct:save")
     @ResponseBody
     public R save(@RequestBody GoodsProductEntity goodsProduct) {
+        GoodsProductEntity queryBySku = goodsProductService.queryBySku(goodsProduct.getSku());
+        if (queryBySku!=null) {
+            return R.error("此sku:"+queryBySku.getSku()+"以备案");
+        }
+        GoodsProductEntity barcode = goodsProductService.queryByBarcode(goodsProduct.getProdBarcode());
+        if (barcode!=null) {
+            return R.error("此产品条码:"+barcode.getProdBarcode()+"以备案");
+        }
         goodsProductService.save(goodsProduct);
-
         return R.ok();
     }
 

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

@@ -62,6 +62,11 @@ public class SalesDataUploadEntity implements Serializable {
      * 门店编号
      */
     private String shopSN;
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
 
 
     /**
@@ -183,6 +188,14 @@ public class SalesDataUploadEntity implements Serializable {
         this.shopSN = shopSN;
     }
 
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
     public String getThirdMerchSN() {
         return thirdMerchSN;
     }

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

@@ -25,10 +25,10 @@ public class RealtimeSalesDetectionServiceImpl implements RealtimeSalesDetection
         RealtimeSalesDetection r = orderDao.queryRealtimeSales(realtimeSalesDetection);
         if(r!=null && r.getGuestNumber()>0){
             //计算优惠损失 销售额-实际销售额
-//            r.setPreferentialLoss(r.getTotalSales().subtract(r.getActualSales()));
+            r.setPreferentialLoss(r.getTotalSales().subtract(r.getActualSales()));
             if(null !=r.getTotalCost() && (new BigDecimal(0)!=r.getTotalCost()) && null !=r.getActualSales()){
                 //计算毛利 实际销售额-总成本
-                r.setGrossProfit(r.getActualSales().subtract(r.getTotalCost()));
+                r.setGrossProfit(r.getActualSales().subtract(r.getTotalCost()).setScale(2,BigDecimal.ROUND_HALF_UP));
                 //计算毛利率 总成本/实际销售额
                 r.setGrossProfitRatio(r.getGrossProfit().divide(r.getActualSales(), 2, BigDecimal.ROUND_HALF_UP));
             }

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

@@ -46,7 +46,7 @@
     		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
+		left join mall_store store on record.shop_sn = store.id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -399,9 +399,9 @@
         SELECT distinct
         o.id,
         o.order_sn,
-        s.store_name,
-
+        s.store_name storeName,
         o.pay_name,
+        u.userName userName,
         o.mobile,
         o.is_onffline_order,
         o.order_biz_type,
@@ -416,7 +416,7 @@
         from mall_order o
         LEFT JOIN mall_store s on o.store_id = s.id
         LEFT JOIN mall_order_goods g ON o.id = g.order_id
-
+        LEFT JOIN mall_user u ON o.user_id = u.id
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}
@@ -1660,7 +1660,6 @@
             count( distinct o.order_sn ) AS guestNumber,
             sum( og.actual_payment_amount) + sum(og.discounted_price)AS totalSales,
             sum( og.actual_payment_amount) - sum(og.tax_price) + sum(og.discounted_price) AS actualSales,
-            sum(sr.retail_price * og.number - og.actual_payment_amount) as preferentialLoss,
             s.store_name AS storeName,
             max( o.add_time ) AS lastSalesTime ,
             sum( sr.bottom_line_price) AS totalCost

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

@@ -45,10 +45,13 @@
 			u.merch_sn,
 			u.third_merch_sn,
 			u.shop_sn,
+			ms.store_name shopName,
 			su.username
 		from mall_sales_data_upload u
 		left join sys_user su
 		on su.user_id = u.creater_sn
+		left join mall_store ms
+		on u.shop_sn = ms.id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND u.file_name LIKE concat('%',#{name},'%')

kmall-admin/src/main/resources/mybatis/mapper/statistics/MonthlyCustomersDao.xml

@@ -130,7 +130,7 @@
 			g.brand
 		ORDER BY
 			sales desc
-		LIMIT 10
+		LIMIT 50
 	</select>
 
 	<select id="top10BySupplier" resultType="com.kmall.admin.entity.MonthlySalesGrowthEntity" >
@@ -163,7 +163,7 @@
 		s.id
 		ORDER BY
 			sales desc
-		LIMIT 10
+		LIMIT 50
 	</select>
 
 	<select id="salesByCategory" resultType="com.kmall.admin.entity.MonthlySalesGrowthEntity">
@@ -181,10 +181,10 @@
 			AND o.order_biz_type = '10'
 			AND o.pay_status = '2'
 			<if test="startDate != null and startDate.trim() != ''">
-				and DATE_FORMAT(o.pay_time,'%Y-%m')  &gt;= #{startDate}
+				and DATE_FORMAT(o.pay_time,'%Y-%m-%d')  &gt;= #{startDate}
 			</if>
 			<if test="endDate != null and endDate.trim() != ''">
-				and DATE_FORMAT(o.pay_time,'%Y-%m') &lt;= #{endDate}
+				and DATE_FORMAT(o.pay_time,'%Y-%m-%d') &lt;= #{endDate}
 			</if>
 			<if test="merchSn != null">
 				and m.merch_sn = #{merchSn}

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

@@ -45,21 +45,21 @@
 
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-12 ">
-                    <span>门店编号：</span><input v-model="storeId" id="storeId"/>
+                    <span>门店id：</span><input v-model="storeId" id="storeId"/>
                     <span style="color: red;margin: 10px">{{storeName}}</span>
-                    <span>品类编号：</span><input v-model="categoryId" id="categoryId"/>
+                    <span>品类id：</span><input v-model="categoryId" id="categoryId"/>
                     <span style="color: red;margin: 10px">{{categoryName}}</span>
                 <!--</div>-->
                 <!--</div>-->
                 <!--<div class="row" style="border:0;margin-bottom:10px">-->
                 <!--<div class="col-md-12 ">-->
-                    <span>部门编号：</span><input v-model="merchSn" id="merchSn"/>
-                    <span style="color: red;margin: 10px">{{merchName}}</span> &nbsp;&nbsp;
+                    <span>商户编号：</span><input v-model="merchSn" id="merchSn"/>
+                   <!-- <span style="color: red;margin: 10px">{{merchName}}</span> &nbsp;&nbsp;
                     <span>业态：</span>
-                    <!--业态下拉框-->
+                    &lt;!&ndash;业态下拉框&ndash;&gt;
                     <select name="formatsSelect" v-model="formatsSelect" disabled>
                         <option :value="formats.id" v-for="formats in formatsList">{{formats.name}}</option>
-                    </select>&nbsp;
+                    </select>&nbsp;-->
                 </div>
             </div>
 
@@ -88,9 +88,9 @@
                     </select>
 
                     <!--含税下拉框-->
-                    <select name="rateSelect" v-model="rateSelect" disabled>
+                   <!-- <select name="rateSelect" v-model="rateSelect" disabled>
                         <option :value="rate.id" v-for="rate in rateList">{{rate.name}}</option>
-                    </select>
+                    </select>-->
 
                     <i-button type="warning"v-on:click="clearFlushTime" id="clearFlushTime">停止刷新
                     </i-button>

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

@@ -38,8 +38,8 @@
         <div class="container-fluid  coldiv">
             <div class="row" style="border:0;margin-bottom:10px">
             <span>日期：</span>
-            <input type="month" name="startDate" id="startDate"/>&nbsp;
-            <input type="month" name="endDate" id="endDate" />&nbsp;
+            <input type="date" name="startDate" id="startDate"/>&nbsp;
+            <input type="date" name="endDate" id="endDate" />&nbsp;
                 <input type="button" name="queryButton" value="查询" onclick="queryMonthly()" />
             </div>
         </div>

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

@@ -24,7 +24,7 @@
             </div>
             <div class="buttons-group">
 
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/brand_export_yyyy_mm_dd_v1.0.0.xls">品牌导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a @click="importtemplateBrand">品牌导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-format-error="uploadExcelFormatError"
                             :format="['xls','xlsx']"

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

@@ -23,7 +23,8 @@ $(function () {
             {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},
+            {label: '门店地址', name: 'storeName', index: 'storeName', align: 'center',width: 150},
+            {label: '操作店员', name: 'userName', index: 'userName', align: 'center',width: 80},
             {
                 label: '订单状态', name: 'orderStatus', index: 'order_status', align: 'center',width: 180,
                 formatter: function (value) {

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

@@ -57,7 +57,7 @@ function dFun(dateList, totalNumberList, totalSalesList,taotalCustomersList,avgB
         },
         grid: {
             show: false,
-            left: '3%',
+            left: '8%',
             right: '4%',
             bottom: '10%'
         },

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

@@ -23,7 +23,7 @@ $(function () {
         url: '../realtimeSalesDetection/query',
         datatype: "json",
         colModel: [
-            {label: '门店编码', name: 'storeId', index: 'storeId', width: 80},
+            {label: '门店id', name: 'storeId', index: 'storeId', width: 80},
             {label: '门店名称', name: 'storeName', index: 'storeName', width: 120},
             {label: '商户编码', name: 'merchSn', index: 'storeId', width: 220},
             {label: '商户名称', name: 'merchName', index: 'storeName', width: 120},

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

@@ -4,6 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'fileId', name: 'fileId', index: 'file_id', key: true, hidden: true, align: 'center'},
+			{label: '门店名称', name: 'shopName', index: 'shopName', width: 100, align: 'center'},
 			{label: '文件名称', name: 'fileName', index: 'file_name', width: 80, align: 'center'},
 			{label: '文件类型', name: 'fileType', index: 'file_type', width: 80, align: 'center'},
 			{label: '上传地址', name: 'uploadAddress', index: 'upload_address', width: 80 ,align: 'center'},

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

@@ -10,7 +10,7 @@ var dChart = echarts.init(document.getElementById('main3'));
 function dFun(productNameList,salesList) {
     dChart.setOption({
         title: {
-            text: '产品销量前10'
+            text: '产品销量前50'
         },
         tooltip: {
             trigger: 'axis',

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

@@ -451,6 +451,14 @@ var vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         },
+        importtemplateBrand: function (){
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
+            window.location.href='../statics/file/brand_export_yyyy_mm_dd_v1.0.0.xls';
+            setTimeout(msg, 1000);
+        },
         exportBrand: function () {
             const msg = this.$Message.loading({
                 content: 'Loading...',

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

@@ -156,8 +156,88 @@ let vm = new Vue({
     data: {
         showList: true,
         title: null,
-        goodsProduct: {},
+        goodsProduct: {merchSn:'',thirdMerchSn:'',prodBarcode:'',batchNo:'',sku:'',
+            cusGoodsCode:'',prodName:'',ciqProdModel:'',oriCntCode:'',unitCode:'',
+            declPrice:'',declCurrencyCode:'',ciqMainEle:'',isLaw:1,isGift:1,
+            cusDeclEle:'',legalUnit1Qty:'',netWeight:'',legalUnit2Qty:'',
+            createrSn:'',createTime:'',upImg:'',downImg:'',leftImg:'',rightImg:'',beforeImg:'',afterImg:''
+        },
         ruleValidate: {
+            merchSn: [
+                {required: true, message: '商户编号不能为空', trigger: 'blur'}
+            ],
+            thirdMerchSn: [
+                {required: true, message: '第三方商户编号不能为空', trigger: 'blur'}
+            ],
+            prodBarcode: [
+                {required: true, message: '产品条码不能为空', trigger: 'blur'}
+            ],
+            batchNo: [
+                {required: true, message: '批次号不能为空', trigger: 'blur'}
+            ],
+            sku: [
+                {required: true, message: 'sku不能为空', trigger: 'blur'}
+            ],
+            cusGoodsCode: [
+                {required: true, message: '海关商品编码不能为空', trigger: 'blur'}
+            ],
+            prodName: [
+                {required: true, message: '中文名称不能为空', trigger: 'blur'}
+            ],
+            ciqProdModel: [
+                {required: true, message: '国检规格型号不能为空', trigger: 'blur'}
+            ],
+            oriCntCode: [
+                {required: true, message: '原产国代码，海关编码不能为空', trigger: 'blur'}
+            ],
+            unitCode: [
+                {required: true, message: '计量单位代码，参见海关编码不能为空', trigger: 'blur'}
+            ],
+            declPrice: [
+                {required: true, message: '申报价格不能为空', trigger: 'blur'}
+            ],
+            declCurrencyCode: [
+                {required: true, message: '申报币种代码,参见海关编码不能为空', trigger: 'blur'}
+            ],
+            ciqMainEle: [
+                {required: true, message: '主要成分不能为空', trigger: 'blur'}
+            ],
+            cusDeclEle: [
+                {required: true, message: '海关申报要素，报统一版不能为空', trigger: 'blur'}
+            ],
+            createrSn: [
+                {required: true, message: '创建人编号不能为空', trigger: 'blur'}
+            ],
+            createTime: [
+                {required: true, message: '创建时间不能为空', trigger: 'blur'}
+            ],
+            legalUnit1Qty: [
+                {required: true, message: '第一法定单位数量不能为空', trigger: 'blur'}
+            ],
+            netWeight: [
+                {required: true, message: '净重,kg不能为空', trigger: 'blur'}
+            ],
+            legalUnit2Qty: [
+                {required: true, message: '第二法定单位数量不能为空', trigger: 'blur'}
+            ],
+            upImg: [
+                {required: true, message: '上方图片不能为空', trigger: 'blur'}
+            ],
+            downImg: [
+                {required: true, message: '下方图片不能为空', trigger: 'blur'}
+            ],
+            leftImg: [
+                {required: true, message: '左侧图片不能为空', trigger: 'blur'}
+            ],
+            rightImg: [
+                {required: true, message: '右侧图片不能为空', trigger: 'blur'}
+            ],
+            beforeImg: [
+                {required: true, message: '前方图片不能为空', trigger: 'blur'}
+            ],
+            afterImg: [
+                {required: true, message: '后方图片不能为空', trigger: 'blur'}
+            ],
             name: [
                 {required: true, message: '名称不能为空', trigger: 'blur'}
             ]

kmall-manager/src/main/resources/conf/db.properties

@@ -1,23 +1,51 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
-jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_general?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=tuser
-jdbc.password=Qq!123
+#jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_general?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=tuser
+#jdbc.password=Qq!123
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=kmall_cw
 #jdbc.password=eb6zHJg%x3
 
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2+
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+
+#---------- for hikari
+#jdbc.driver=com.mysql.jdbc.Driver
+##jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000
+
+
+
+####========== \u751F\u4EA7\u73AF\u5883 ==========
+#\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
+#jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
+jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+# \u65B0\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
+#jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=kmall_cw
+jdbc.password=eb6zHJg%x3
+
 jdbc.initialSize=5
 jdbc.maxActive=30
 
-jdbc.minPoolSize=2+
+jdbc.minPoolSize=2
 jdbc.maxIdleTime=30000
 jdbc.idleConnectionTestPeriod=100
-
-#---------- for hikari
-jdbc.driver=com.mysql.jdbc.Driver
+#
+##---------- for hikari
 #jdbc.driver=org.mariadb.jdbc.Driver
+jdbc.driver=com.mysql.jdbc.Driver
 jdbc.idleTimeout=400000
 jdbc.maxLifetime=500000
 jdbc.connectionTimeout=5000
@@ -25,33 +53,6 @@ jdbc.maximumPoolSize=5
 jdbc.validationTimeout=4000
 
 
-
-####========== \u751F\u4EA7\u73AF\u5883 ==========
-#\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
-##jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-## \u65B0\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-##jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=kmall_cw
-#jdbc.password=eb6zHJg%x3
-#
-#jdbc.initialSize=5
-#jdbc.maxActive=30
-#
-#jdbc.minPoolSize=2
-#jdbc.maxIdleTime=30000
-#jdbc.idleConnectionTestPeriod=100
-#
-##---------- for hikari
-#jdbc.driver=org.mariadb.jdbc.Driver
-#jdbc.idleTimeout=400000
-#jdbc.maxLifetime=500000
-#jdbc.connectionTimeout=5000
-#jdbc.maximumPoolSize=5
-#jdbc.validationTimeout=4000
-
-
 ###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u5F00\u53D1\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=tuser
@@ -60,7 +61,7 @@ jdbc.validationTimeout=4000
 #jdbc.initialSize=5
 #jdbc.maxActive=30
 #
-#jdbc.minPoolSize=2+
+#jdbc.minPoolSize=2
 #jdbc.maxIdleTime=30000
 #jdbc.idleConnectionTestPeriod=100
 #

kmall-manager/src/main/resources/conf/express-kdn.properties

@@ -1,7 +1,7 @@
 ########## \u5FEB\u9012-\u5FEB\u9012\u9E1F\u914D\u7F6E ##########
 
 # [dev, prod]
-express.kdn.env=dev
+express.kdn.env=prod
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
 #\u7535\u5546ID

kmall-manager/src/main/resources/conf/express-sf.properties

@@ -1,7 +1,7 @@
 ########## \u5FEB\u9012-sf\u914D\u7F6E ##########
 
 # [dev, prod]
-express.sf.env=dev
+express.sf.env=prod
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
 #\u8D26\u53F7

kmall-manager/src/main/resources/conf/redis.properties

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
-redis.env=dev
+redis.env=prod
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform

kmall-manager/src/main/resources/conf/wx-mp.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.env=dev
+pay.wx.env=prod
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========