Merge remote-tracking branch 'upsteam/master'

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

@@ -1065,7 +1065,6 @@ public class OrderController {
             tax = tax.add(goodsTax).setScale(2,RoundingMode.HALF_UP);
 //            BigDecimal goodsTax = retailPrice.divide(new BigDecimal(1).add(goodsRate),2,RoundingMode.HALF_DOWN).multiply(goodsRate).multiply(new BigDecimal(number)).setScale(0,RoundingMode.HALF_DOWN);
         }*/
-        String response = null;
 
 //        try {
 //            // 查询失败原因
@@ -1081,7 +1080,7 @@ public class OrderController {
         result.put("orderEntity",orderEntity);
         result.put("goodsList",goodsList);
         result.put("tax",tax.setScale(2, RoundingMode.HALF_DOWN).toString());
-        result.put("response",response);
+        result.put("response",orderProcessRecordEntity.getClearMsg());
 
         return R.ok().put("resultObj", result);
     }

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

@@ -1163,7 +1163,7 @@ public class GoodsServiceImpl implements GoodsService {
             if (brandId == null) {
                 Map<String, String> brandCacheData = new HashMap<>();
                 // 数据库里面查询
-                BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
+                BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier.trim());
                 if (queryBrand == null) {
                     throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
                 } else {
@@ -1178,18 +1178,9 @@ public class GoodsServiceImpl implements GoodsService {
         }else{
             Map<String, String> brandCacheData = new HashMap<>();
             // 数据库里面查询
-            BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
+            BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier.trim());
             if (queryBrand == null) {
-                BrandEntity brandEntity = new BrandEntity();
-                brandEntity.setName(brandName);
-                brandEntity.setUniqueIdentifier(uniqueIdentifier);
-                brandEntity.setSimpleDesc(brandName);
-                brandEntity.setIsShow(1);
-                brandEntity.setIsNew(0);
-                brandService.save(brandEntity);
-                brandCacheData.put("brandId", brandEntity.getId() + "");
-                brandCacheData.put("brandName", brandName);
-                goodsEntity.setBrandId(brandEntity.getId());
+                throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
             } else {
                 brandCacheData.put("brandId", queryBrand.getId() + "");
                 brandCacheData.put("brandName", queryBrand.getName());

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

@@ -1,6 +1,5 @@
 package com.kmall.admin.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.Maps;
 import com.kmall.admin.dao.*;
@@ -923,7 +922,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                 StoreEntity store = storeDao.queryObjectByName(storeGoodsDto.getStoreName().trim());
                 storeRelaEntity.setExitRegionNumber(storeGoodsDto.getExitRegionNumber());
                 storeRelaEntity.setStoreId(store.getId());
-                GoodsEntity goodsEntity = goodsDao.queryObjectBySnNew(storeGoodsDto.getGoodsSn());
+                GoodsEntity goodsEntity = goodsDao.queryObjectBySnNew(storeGoodsDto.getGoodsSn().trim());
                 if (goodsEntity != null) {
                     storeRelaEntity.setGoodsId(goodsEntity.getId());
                 }else{
@@ -1005,7 +1004,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             if (brandId == null) {
                 Map<String, String> brandCacheData = new HashMap<>();
                 // 数据库里面查询
-                BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
+                BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier.trim());
                 if (queryBrand == null) {
                     throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
                 } else {
@@ -1020,7 +1019,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         }else{
             Map<String, String> brandCacheData = new HashMap<>();
             // 数据库里面查询
-            BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
+            BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier.trim());
             if (queryBrand == null) {
                 throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
             } else {

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

@@ -95,6 +95,7 @@
 		`shipment_succ_time`,
 		`process_content`,
 		`customs_send_sms_status`,
+		customs_msg as clearMsg,
 		r.`tstm`,
 		o.ali_trade_no as pay_transaction_id
 		from mall_order_process_record r inner join mall_order o on r.order_sn = o.order_sn

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

@@ -32,13 +32,11 @@
 
     <select id="queryList" resultType="com.kmall.admin.entity.UserEntity">
         SELECT DISTINCT
-        mall_user.*
-        ,mall_user_level.NAME levelName
-        FROM
-        mall_user
-        LEFT JOIN mall_user_level ON mall_user.user_level_id = mall_user_level.id
-        LEFT JOIN mall_merch_user mu ON mall_user.id = mu.user_id
-        LEFT JOIN mall_store s on mu.store_id = s.id
+            mu1.*
+            FROM
+            mall_store s
+        LEFT JOIN mall_merch_user mu ON s.id = mu.store_id
+        LEFT JOIN mall_user mu1 on mu1.id = mu.user_id
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             and mu.store_id = #{storeId}
@@ -50,10 +48,10 @@
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="username != null and username.trim() != ''">
-            and mall_user.username like concat('%',#{username},'%')
+            and mu1.username like concat('%',#{username},'%')
         </if>
         <if test="mobile != null and mobile.trim() != ''">
-            and mall_user.mobile like concat('%',#{mobile},'%')
+            and mu1.mobile like concat('%',#{mobile},'%')
         </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">

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

@@ -426,7 +426,7 @@
                                 <div class="col-md-3" id="pickUpCodeSn">小票码: {{orderEntity.pickUpCodeSn}}</div>
                             </div>
                             <div class="row" style="border:0">
-                                <div class="col-md-12" id="invetoryReceipt">失败原因: {{response}}</div>
+                                <div class="col-md-12" id="invetoryReceipt">清关结果: {{response}}</div>
                             </div>
                             <table id="goodsDetailTable" class="table .table-striped" style="margin-top: 50px;">
                                 <tr style="border: white;background-color: orange">

sql/init/other_table.sql

@@ -383,7 +383,7 @@ CREATE TABLE `mall_ad`  (
 DROP TABLE IF EXISTS `mall_ad_position`;
 CREATE TABLE `mall_ad_position`  (
   `id` tinyint(3) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '\'' COMMENT '广告位名称',
+  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '广告位名称',
   `width` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '宽度',
   `height` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '高度',
   `desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '描述',
@@ -1353,7 +1353,8 @@ CREATE TABLE `mall_merch_user`  (
   `tstm` datetime(0) DEFAULT NULL COMMENT '时间戳',
   `is_load_goods` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '门店商品是否有修改，  0：否 1：是',
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `store_id_merch_sn_index`(`store_id`, `merch_sn`) USING BTREE
+  INDEX `idx_user_id`(`user_id`) USING BTREE
+  INDEX `idx_store_id`(`store_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 77671 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户商户关联表' ROW_FORMAT = Compact;
 
 -- ----------------------------

sql/init/sys_table.sql

@@ -514,7 +514,7 @@ INSERT INTO `sys_menu` VALUES (403, 402, '查看', NULL, 'sys:notice:list,sys:no
 INSERT INTO `sys_menu` VALUES (404, 402, '新增', NULL, 'sys:notice:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (405, 402, '修改', NULL, 'sys:notice:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (406, 402, '删除', NULL, 'sys:notice:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (422, 366, '门店打印机', 'sys/printer.html', NULL, 1, 'fa fa-print', 2, 0);
+INSERT INTO `sys_menu` VALUES (422, 366, '门店打印机', 'sys/printer.html', NULL, 1, 'fa fa-print', 2, 1);
 INSERT INTO `sys_menu` VALUES (423, 422, '查看', NULL, 'sys:printer:list,sys:printer:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (424, 422, '新增', NULL, 'sys:printer:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (425, 422, '修改', NULL, 'sys:printer:update', 2, NULL, 6, 0);
@@ -529,7 +529,7 @@ INSERT INTO `sys_menu` VALUES (444, 357, '门店商品', 'shop/storeProductStock
 INSERT INTO `sys_menu` VALUES (445, 444, '导入', NULL, 'productstorerela:upload', 2, NULL, 3, 0);
 INSERT INTO `sys_menu` VALUES (447, 444, '修改', NULL, 'productstorerela:update', 2, NULL, 2, 0);
 INSERT INTO `sys_menu` VALUES (448, 444, '新增', NULL, 'productstorerela:save', 2, NULL, 1, 0);
-INSERT INTO `sys_menu` VALUES (609, 222, '运费模版', 'shop/freight.html', NULL, 1, 'fa fa-truck', 1, 0);
+INSERT INTO `sys_menu` VALUES (609, 222, '运费模版', 'shop/freight.html', NULL, 1, 'fa fa-truck', 1, 1);
 INSERT INTO `sys_menu` VALUES (610, 609, '查看', NULL, 'freight:list,freight:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (611, 609, '新增', NULL, 'freight:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (612, 609, '修改', NULL, 'freight:update', 2, NULL, 6, 0);
@@ -653,18 +653,18 @@ INSERT INTO `sys_menu` VALUES (860, 859, '支付单信息', 'compared/payorderin
 INSERT INTO `sys_menu` VALUES (861, 859, '支付异常单信息', 'compared/ordercomparederror.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
 INSERT INTO `sys_menu` VALUES (862, 859, '税单导入', 'compared/taxinfo.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
 INSERT INTO `sys_menu` VALUES (863, 859, '税单异常', 'compared/taxcomparederror.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
-INSERT INTO `sys_menu` VALUES (875, 0, '转移管理', NULL, NULL, 0, 'fa fa-leanpub', 3, 0);
-INSERT INTO `sys_menu` VALUES (876, 875, '门店库存转移单表', 'shop/storetransferinventoryorder.html', NULL, 1, 'fa fa-file-code-o', 6, 0);
+INSERT INTO `sys_menu` VALUES (875, 0, '转移管理', NULL, NULL, 0, 'fa fa-leanpub', 3, 1);
+INSERT INTO `sys_menu` VALUES (876, 875, '门店库存转移单表', 'shop/storetransferinventoryorder.html', NULL, 1, 'fa fa-file-code-o', 6, 1);
 INSERT INTO `sys_menu` VALUES (877, 876, '查看', NULL, 'storetransferinventoryorder:list,storetransferinventoryorder:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (878, 876, '新增', NULL, 'storetransferinventoryorder:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (879, 876, '修改', NULL, 'storetransferinventoryorder:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (880, 876, '删除', NULL, 'storetransferinventoryorder:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (881, 875, '门店库存转移单详情表', 'shop/storetransferinventoryorderdetail.html', NULL, 1, 'fa fa-file-code-o', 6, 0);
+INSERT INTO `sys_menu` VALUES (881, 875, '门店库存转移单详情表', 'shop/storetransferinventoryorderdetail.html', NULL, 1, 'fa fa-file-code-o', 6, 1);
 INSERT INTO `sys_menu` VALUES (882, 881, '查看', NULL, 'storetransferinventoryorderdetail:list,storetransferinventoryorderdetail:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (883, 881, '新增', NULL, 'storetransferinventoryorderdetail:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (884, 881, '修改', NULL, 'storetransferinventoryorderdetail:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (885, 881, '删除', NULL, 'storetransferinventoryorderdetail:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (888, 1, '快递公司列表', 'sys/expresscompanysys.html', '', 1, 'fa fa-file-code-o', 13, 0);
+INSERT INTO `sys_menu` VALUES (888, 1, '快递公司列表', 'sys/expresscompanysys.html', '', 1, 'fa fa-file-code-o', 13, 1);
 INSERT INTO `sys_menu` VALUES (889, 888, '查看', NULL, 'expresscompanysys:list,expresscompanysys:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (890, 888, '新增', NULL, 'expresscompanysys:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (891, 888, '修改', NULL, 'expresscompanysys:update', 2, NULL, 6, 0);