1.收银界面产品过多滚动条最下面

2.导入所有商品时，不校验是否存在
3.取货码显示顺序

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

@@ -827,7 +827,7 @@ public class GoodsServiceImpl implements GoodsService {
                 map.put("goodsBizType", goodsDto.getGoodsBizType());
                 List<GoodsEntity> list = querySame(map);
                 if (list != null && list.size() != 0) {
-                    isFail = true;
+//                    isFail = true;
                     if(goodsDto.getSku()!=null) {
                         failSameSkuList.add(goodsDto.getSku());
                     }
@@ -1057,19 +1057,19 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsUtils.save(exportExceptionDataEntity);
                 throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
-            if(failGoodsSnList != null && failGoodsSnList.size() > 0){
-                if(failSameSkuList.size()>0) {
-                    exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
-                            failGoodsTypeList + "】，SKU【" + failSameSkuList + "】的商品信息");
-                    goodsUtils.save(exportExceptionDataEntity);
-                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-                }else{
-                    exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
-                            failGoodsTypeList + "】的商品信息");
-                    goodsUtils.save(exportExceptionDataEntity);
-                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-                }
-            }
+//            if(failGoodsSnList != null && failGoodsSnList.size() > 0){
+//                if(failSameSkuList.size()>0) {
+//                    exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
+//                            failGoodsTypeList + "】，SKU【" + failSameSkuList + "】的商品信息");
+//                    goodsUtils.save(exportExceptionDataEntity);
+//                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
+//                }else{
+//                    exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
+//                            failGoodsTypeList + "】的商品信息");
+//                    goodsUtils.save(exportExceptionDataEntity);
+//                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
+//                }
+//            }
             if(failTypeGoodsSnList != null && failTypeGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("货品业务类型只能是【00保税备货、02保税补货、10保税展示】！请检查商品编码【"+failTypeGoodsSnList+"】的商品信息");
                 goodsUtils.save(exportExceptionDataEntity);

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

@@ -2147,6 +2147,8 @@ public class OrderServiceImpl implements OrderService {
             consumptionRecords.setCreateTime(new Date());
             memberConsumptionRecordsDao.save(consumptionRecords);
 
+
+
             // 生成取票码
             PickUpCodeEntity pickUpCodeEntity = new PickUpCodeEntity();
             pickUpCodeEntity.setOrderSn(order.getOrder_sn());

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

@@ -56,6 +56,7 @@
     		`tstm`
 		from mall_pick_up_code
 		WHERE 1=1
+		and pick_up_code_status != 3
 		<if test="orderSn != null and orderSn.trim() != ''">
 			AND `order_sn` LIKE concat('%',#{orderSn},'%')
 		</if>
@@ -70,7 +71,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by pick_up_code_status, pick_up_code_createtime desc
+                order by FIELD(pick_up_code_status,0,2,3,1), pick_up_code_createtime desc
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

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

@@ -81,7 +81,7 @@
             </div>
             <div class="col-md-6" style="padding: 0px;padding-bottom: 10%;background-color: #f0f0f0">
                 <ul class="list-unstyled; ">
-                    <li style="height: 600px;overflow:auto">
+                    <li ref="overflowLi" style="height: 600px;overflow:auto">
                         <table id="cbec" class="table .table-striped">
                             <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
                                 <th style="width: 300px;padding: 7px">跨境商品名称</th>

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

@@ -583,12 +583,9 @@ let vm = new Vue({
             });
         },
         query: function () {
-
-
-
-
             vm.storeId = sessionStorage.getItem("storeId");;
             var thisGoods = {};
+            var overflowLi = this.$refs.overflowLi;
             $.get("../goods/details/"+vm.prodBarcode+"/"+vm.storeId, function (r) {
                 if (r.code == 0) {
 
@@ -598,8 +595,10 @@ let vm = new Vue({
                     calculateGoodsPrice(r);
                     handle(r.goodsDetails,"add");
 
-
-
+                    //此时必须异步执行滚动条滑动至底部
+                    setTimeout(()=>{
+                        overflowLi.scrollTop = overflowLi.scrollHeight;
+                    },0)
                 } else {
                     alert(r.msg);
                 }
@@ -1198,8 +1197,8 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
-        webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
-        // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
+        webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');
         }