Merge branch 'feature/海控项目改造1028-qng'

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

@@ -1113,6 +1113,8 @@ public class OrderController {
                 url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/clsOrder/"+orderSn;
             }else if("forceSend".equals(resendType)){
                 url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/forceSend/"+orderSn;
+            }else if("resendOrder".equals(resendType)){
+                url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/resendOrder/"+orderSn;
             }
             // 同步访问,返回结果字符串
             response = OkHttpUtils.post(map, url, "SSL");

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

@@ -869,14 +869,7 @@ public class GoodsServiceImpl implements GoodsService {
                     failGoodsSnList.add(goodsDto.getGoodsSn());
                     failGoodsTypeList.add(goodsDto.getGoodsBizType());
                 }
-                //校验产品条码是否存在
-//                List<GoodsEntity> prodbarGoods = goodsDao.queryObjectByProdBarcode(goodsDto.getProdBarcode(),merchSn,null);
-//                if(prodbarGoods != null && prodbarGoods.size() > 0){
-//                    isFail = true;
-//                    failProdbarGoodsSnList.add(goodsDto.getGoodsSn());
-//                }else{
                 goodsEntity.setProdBarcode(goodsDto.getProdBarcode());
-//                }
                 //热销商品校验
                 if (Dict.orderBizType.item_02.getItem().equals(goodsDto.getGoodsBizType())
                         || Dict.orderBizType.item_10.getItem().equals(goodsDto.getGoodsBizType())) {
@@ -905,7 +898,7 @@ public class GoodsServiceImpl implements GoodsService {
 
                         // TODO 这里改成批量插入 SupplierEntity
 //                        insertSupplierList.add(supplierEntity);
-
+                        //新增商品供货信息
                         supplierDao.save(supplierEntity);
 //                        supplierEntity = supplierDao.queryObjectByName(goodsDto.getSupplierName(), thirdMerchantBizEntity.getMerchSn(),thirdMerchantBizEntity.getThirdPartyMerchCode());
                         goodsEntity.setSupplierId(supplierEntity.getId());
@@ -1178,59 +1171,17 @@ 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(failTypeGoodsSnList != null && failTypeGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("货品业务类型只能是【00保税备货、02保税补货、10保税展示】！请检查商品编码【"+failTypeGoodsSnList+"】的商品信息");
                 goodsUtils.save(exportExceptionDataEntity);
                 throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
-//            if(failProdbarGoodsSnList != null && failProdbarGoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("不能有重复的产品条码信息！请检查商品编码【"+failProdbarGoodsSnList+"】的商品产品条码信息");
-//                goodsUtils.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
             if(failHotGoodsSnList != null && failHotGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("请检查业务类型为【保税补货或保税展示】的商品，商品编码【"+failHotGoodsSnList+"】的商品不能设置为热销！");
                 goodsUtils.save(exportExceptionDataEntity);
                 throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
-//            if(failCateGoodsSnList != null && failCateGoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("分类信息请在商城配置》商品分类中维护，商品分类与商户信息对应，请检查该商品商户信息下的分类是否维护，不存在的商品编码【"+failCateGoodsSnList+"】");
-//                exportExceptionDataDao.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
-//            if(failCateL2GoodsSnList != null && failCateL2GoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("分类信息请在商城配置》商品分类中查看，商品分类必须为二级分类，不存在的商品编码【"+failCateL2GoodsSnList+"】");
-//                exportExceptionDataDao.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
-//            if(failBrandGoodsSnList != null && failBrandGoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("品牌信息请在商城配置》品牌制造商中维护，品牌与商户信息对应，请检查该商品商户信息下的品牌是否维护，不存在的商品编码【" + failBrandGoodsSnList + "】");
-//                exportExceptionDataDao.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
-//            if(failFreightGoodsSnList != null && failFreightGoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("运费信息请在商城配置》运费模板中维护，运费与商户信息对应，请检查该商品商户信息下的运费是否维护，不存在的商品编码【"+failFreightGoodsSnList+"】,运费【"+failFreightList+"】");
-//                exportExceptionDataDao.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
-//            if(failSuppGoodsSnList != null && failSuppGoodsSnList.size() > 0){
-//                exportExceptionDataEntity.setExportExceptionData("供应商信息请在商城配置》商品供应商中维护，供应商与商户信息对应，请检查该商品商户信息下的供应商是否维护，不存在的商品编码【" + failSuppGoodsSnList + "】");
-//                goodsUtils.save(exportExceptionDataEntity);
-//                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-//            }
+
             if(failUnitGoodsSnList != null && failUnitGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("计算单位信息请在商城配置》计算单位中维护，不存在的商品编码【" + failUnitGoodsSnList + "】");
                 goodsUtils.save(exportExceptionDataEntity);

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

@@ -2342,23 +2342,23 @@ public class OrderServiceImpl implements OrderService {
 
             processRecordEntity.setPaymentStartTime(new Date());
             // 判断是微信的支付码还是支付宝的支付码
-            if (parCode.startsWith("28")) {
-                // 支付宝支付
-                try {
-                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            } else {
-                // 微信支付
-                try {
-                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            }
+//            if (parCode.startsWith("28")) {
+//                // 支付宝支付
+//                try {
+//                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            } else {
+//                // 微信支付
+//                try {
+//                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            }
             // TODO req_2021-07-19 客户付款完成时间 req_20210826_001
             customsClearanceTimeliness.send(Arrays.asList(order.getOrder_sn()), "customerPayFinished");
 
@@ -2366,11 +2366,11 @@ public class OrderServiceImpl implements OrderService {
 
 
             // TODO 到时候要注释掉，测试用而已
-//            OrderEntity orderEntity = queryObject(order.getId());
-//            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
-//            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
-//            orderEntity.setPayTime(new Date());
-//            orderDao.update(orderEntity);
+            OrderEntity orderEntity = queryObject(order.getId());
+            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+            orderEntity.setPayTime(new Date());
+            orderDao.update(orderEntity);
 
 
             resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询

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

@@ -208,7 +208,7 @@
                         <ul>
                             <li><h3 style="border: white;padding: 8px;">总件数:{{totalCount}}</h3></li>
                             <li><h3 style="border: white;padding: 8px;">总价:{{totalPrice}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px">优惠价:{{discountedPrice}}</h3></li>
+<!--                            <li><h3 style="border: white;padding: 8px">优惠价:{{discountedPrice}}</h3></li>-->
                             <li><h3 style="border: white;padding: 8px">实际支付价:{{actualPrice}}</h3></li>
                             <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px">满减:{{showReduceMoney}}</h3></li>
                         </ul>
@@ -248,6 +248,10 @@
                                     <div class="modal-body">
                                         <form>
                                             <div class="form-group">
+                                                <label for="customPhone" class="control-label">会员码:</label>
+                                                <input autocomplete="off" type="text" class="form-control" ref="couponBarCode" id="couponBarCode" @blur="customPhoneBlur" />
+                                            </div>
+                                            <div class="form-group">
                                                 <label for="customPhone" class="control-label">手机号:</label>
                                                 <input autocomplete="off" type="text" class="form-control" ref="customPhone" id="customPhone" @blur="customPhoneBlur" />
                                             </div>
@@ -398,7 +402,7 @@
                                     <th>sku</th>
                                     <th>规格</th>
                                     <th>市场价</th>
-                                    <th>优惠价</th>
+<!--                                    <th>优惠价</th>-->
                                     <th>数量</th>
                                     <th>实际支付价</th>
                                     <th>预估税费</th>
@@ -409,7 +413,7 @@
                                     <td>{{item.sku}}</td>
                                     <td>{{item.specification}}</td>
                                     <td>{{item.marketPrice}}</td>
-                                    <td>{{item.discountedPrice}}</td>
+<!--                                    <td>{{item.discountedPrice}}</td>-->
                                     <td>{{item.number}}</td>
                                     <td>{{item.actualPaymentAmount}}</td>
                                     <td >{{item.tax}}</td>
@@ -422,11 +426,12 @@
                             <button v-if="canRefund" type="button" style="margin:0 30px 0 20px;font-size: 20px;float: left" class="btn ivu-btn-error" @click="refundOrder()" id="refundOrder" data-dismiss="modal">退款</button>
                             <button v-else disabled type="button" style="margin:0 30px 0 25px;font-size: 20px;float: left" class="btn ivu-btn-error" @click="refundOrder()"  data-dismiss="modal">退款</button>
                             <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-warning" @click="confirmDelivery" id="confirmDelivery" data-dismiss="modal">确定提货</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendNotice" id="resendNotice" data-dismiss="modal">重发通知</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendWaybill" id="resendWaybill" data-dismiss="modal">重发运单</button>
+<!--                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendNotice" id="resendNotice" data-dismiss="modal">重发通知</button>-->
+<!--                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendWaybill" id="resendWaybill" data-dismiss="modal">重发运单</button>-->
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendorder" id="resendorder" data-dismiss="modal">重发订单</button>
                             <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendPayment" id="resendPayment" data-dismiss="modal">重发支付单</button>
 <!--                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendOrder" id="resendOrder" data-dismiss="modal">重发订单</button>-->
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="forceSendToOms" id="forceSendToOms" data-dismiss="modal">强推清关</button>
+<!--                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="forceSendToOms" id="forceSendToOms" data-dismiss="modal">强推清关</button>-->
                             <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="verification" id="verification" data-dismiss="modal">核销</button>
                             <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="verEwbtion" id="verEwbtion" data-dismiss="modal">打印快递单</button>
                         </div>

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

@@ -140,9 +140,9 @@
                 <i-button type="dashed" @click="unSale"><i class="fa fa-hand-o-down"></i>&nbsp;下架</i-button>
                 #end
 
-                <i-button type="primary" @click="syncGoodsRate"><i class="fa fa-pencil-square-o"></i>&nbsp;选择同步税率</i-button>
-                <i-button type="primary" @click="syncGoodsRateAll"><i class="fa fa-pencil-square-o"></i>&nbsp;全量同步税率</i-button>
-                <i-button type="primary" @click="checkGoodsPrice"><i class="fa fa-pencil-square-o"></i>&nbsp;校验产品价格</i-button>
+<!--                <i-button type="primary" @click="syncGoodsRate"><i class="fa fa-pencil-square-o"></i>&nbsp;选择同步税率</i-button>-->
+<!--                <i-button type="primary" @click="syncGoodsRateAll"><i class="fa fa-pencil-square-o"></i>&nbsp;全量同步税率</i-button>-->
+<!--                <i-button type="primary" @click="checkGoodsPrice"><i class="fa fa-pencil-square-o"></i>&nbsp;校验产品价格</i-button>-->
 
                 <!--<i-button type="info" @click="goodsExport"><i class="fa fa-plus"></i>&nbsp;商品导入</i-button>-->
                 <!--<i-button type="info" @click="sameGoodsExport"><i class="fa fa-plus"></i>&nbsp;普货商品导入</i-button>-->

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

@@ -684,6 +684,7 @@ let vm = new Vue({
             });
 
         },
+        //同条码多sku情况
         saveNew:function(value){
             vm.storeId = sessionStorage.getItem("storeId");
             var overflowLi = this.$refs.overflowLi;
@@ -706,6 +707,7 @@ let vm = new Vue({
                 });
             // })
         },
+        //非同条码
         saveOld:function(){
             vm.storeId = sessionStorage.getItem("storeId");
             var overflowLi = this.$refs.overflowLi;
@@ -916,9 +918,10 @@ let vm = new Vue({
             }
             $('#myModal').modal('show')
             // 每次点击提交订单的时候清空姓名和身份证信息和手机号
-            // vm.$refs.customName.value = "";
-            // vm.$refs.customIDCard.value = "";
-            // vm.$refs.customPhone.value = "";
+            vm.$refs.customName.value = "";
+            vm.$refs.customIDCard.value = "";
+            vm.$refs.customPhone.value = "";
+            vm.$refs.couponBarCode.value = "";
             if(vm.$refs.couponSn)
                 vm.$refs.couponSn.value = "";
             this.userInfo.couponSn = "";
@@ -1019,6 +1022,7 @@ let vm = new Vue({
             this.userInfo.customName = this.$refs.customName.value ;
             this.userInfo.customIDCard =  this.$refs.customIDCard.value ;
             this.userInfo.customPhone = this.$refs.customPhone.value;
+            this.userInfo.couponBarCode = this.$refs.couponBarCode.value;
             var status = $('input:radio:checked').val();
             var cmbCity = $('#cmbCity').val();
             var cmbProvince = $('#cmbProvince').val();
@@ -1160,6 +1164,13 @@ let vm = new Vue({
                 });
             })
         },
+        resendorder:function(){
+            confirm('确认重发订单吗？', function () {
+                $.get("../order/resendOrderToCCNET/"+vm.orderEntity.orderSn+"/resendOrder", function (r) {
+                    alert(r.msg);
+                });
+            })
+        },
         verification:function(){
 
             if(vm.orderProcessRecord.isCustomsSend != 1){
@@ -1377,11 +1388,11 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         //kmall测试环境
-        webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
+        //webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
         //webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
         //kmall本地环境
-        //webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
+        webSocket = new WebSocket("ws://127.0.0.1:8089/ws/server/"+storeId);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');