提交订单资质校验

src/main/resources/static/js/common/serviceapi/order.service.js

@@ -113,6 +113,18 @@ var OrderApi = {
                 callback(res);
             });
         },
+        /* 提交订单 购买资质的验证*/
+        createdOrderVerify: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/submit/verify',
+                type:'POST',
+                data:params,
+                json:false,
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         /* 提交订单 */
         ConfirmOrder: function (params, callback) {
             Http.AjaxService({

src/main/resources/static/js/shopping/confirm.js

@@ -126,7 +126,7 @@ var shoppingConfirm = new Vue({
         svipReducedPrice: 0, //超级会员优惠金额
         isModelAlert:false, // 订单不足提示弹窗
         isModelAlertText:'',
-        isShowConfirm:true,
+        isShowConfirm:1,
         showAgreement: false, // 特殊商品退货须知弹窗
         returnGoodsStutas: false, // 当前商品是否为特殊商品
         helpContent: '', // 退货提示
@@ -691,7 +691,7 @@ var shoppingConfirm = new Vue({
                 _self.handleClickOrderSubmitMit()
             }
         },
-        handleClickOrderSubmitMit:function () {// 提交订单
+        handleClickOrderSubmitMit() {// 提交订单
             var _self = this;
             _self.isModelAlert = false;
             if(_self.submitLoading){return false;}
@@ -763,6 +763,23 @@ var shoppingConfirm = new Vue({
             _self.confirmParam.orderInfo = JSON.stringify(_self.confirmParam.orderInfo);
             _self.confirmParam.orderInvoice = JSON.stringify(_self.confirmParam.orderInvoice);
             console.log('confirmParam',_self.confirmParam);
+            _self.createdOrderVerify(_self.confirmParam);
+        },
+        createdOrderVerify(params) {// 还原提交订单参数格式
+            const _self = this;
+            OrderApi.createdOrderVerify(params,function (res) {
+                if (res.data.code === -1) {
+                    _self.isModelAlert = true;
+                    _self.isShowConfirm = 2;
+                    _self.submitLoading = false;
+                    _self.isModelAlertText = '订单内存在械字号三类商品，需要拥有医疗执业许可证的医美机构才能购买。建议升级医美机构后再下单，否则会导致订单退款或影响发货。';
+                }else{
+                    _self.handleConfirmOrder();
+                }
+            })
+        },
+        handleConfirmOrder(){// 提交
+            const _self = this;
             OrderApi.ConfirmOrder(_self.confirmParam,function (res) {
                 if(res.code === 0){
                     var data = res.data;
@@ -789,13 +806,13 @@ var shoppingConfirm = new Vue({
                     }
                 }else if(res.code === -3){
                     _self.isModelAlert = true;
-                    _self.isShowConfirm = false;
+                    _self.isShowConfirm = 3;
                     _self.submitLoading = false;
                     _self.isModelAlertText = '您已有2个采购金额过小的订单，本次不能再进行采购。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
                     _self.formatConfirmParam();
                 }else if(res.code === -4){
                     _self.isModelAlert = true;
-                    _self.isShowConfirm = false;
+                    _self.isShowConfirm = 3;
                     _self.submitLoading = false;
                     _self.isModelAlertText = '采美豆不足，不能提交订单。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
                     _self.formatConfirmParam();
@@ -809,6 +826,9 @@ var shoppingConfirm = new Vue({
                 }
             });
         },
+        handleClickApply(){
+            window.location.href = '/user/setting/upgrade.html';
+        },
         formatConfirmParam:function(){// 还原提交订单参数格式
             var _self = this;
             _self.confirmParam.payInfo = JSON.parse(_self.confirmParam.payInfo);
@@ -817,7 +837,8 @@ var shoppingConfirm = new Vue({
         },
         handleCloseModel:function () {
             this.isModelAlert = false;
-            this.isShowConfirm= true;
+            this.isShowConfirm= 1;
+            this.formatConfirmParam();
         },
         getProductIds: function(list){// 获取订单商品id列表
             var skuIds = [];

src/main/resources/static/js/user-center/order/detail.js

@@ -113,7 +113,7 @@ var orderPage = new Vue({
         hanldConfirmOrderFn:function(){//确认订单
             var _self = this;
             CAIMEI.Modal('是否确认订单？','取消','确定',function () {
-                OrderApi.AffirmOrderOrder({orderId:_self.orderId},function(response){
+                OrderApi.AffirmOrderOrder({orderId:_self.orderId , userIdentity : 0},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('确认成功',true,function () {
                             _self.GetQueryOrderDetailsInfo();

src/main/resources/static/js/user-center/order/list.js

@@ -191,7 +191,7 @@ var orderPage = new Vue({
         hanldCancelOrderFn:function(orderId){//取消订单
             var _self = this;
             CAIMEI.Modal('确认取消该订单吗？','取消','确定',function () {
-                OrderApi.GetCancelOrder({orderId:orderId},function(response){
+                OrderApi.GetCancelOrder({orderId:orderId , userIdentity : 0},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('取消成功',true,function () {
                             _self.GetQueryOrderListData();

src/main/resources/templates/shopping/confirm.html

@@ -377,7 +377,7 @@
                         <div class="totalPrice" :class="totalDiscountAmount == 0 ? 'none' : ''">总价：<span>¥{{hanldShouldPayFee | NumFormat}}</span></div>
                         <div class="totalCoupon" v-if="totalDiscountAmount > 0">共减：¥{{ totalDiscountAmount | NumFormat }}</div>
                     </div>
-                    <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
+                    <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
                 </div>
             </div>
         </div>
@@ -414,19 +414,23 @@
     </div>
     <!--订单采购量不足提示-->
     <div class="confirm-Model" v-if="isModelAlert">
-        <div class="model-content">
+        <div class="model-content" :style="{ height: isShowConfirm === 2 ? '180px' : '342px' }">
             <div class="title"><p>提示</p><i class="icon-close" @click.stop="handleCloseModel"></i></div>
             <div class="content">
                 <p>{{ isModelAlertText }}</p>
                 <p class="small" v-if="userBeans<0">注：采购金额过小的订单，需要扣除500采美豆</p>
             </div>
-            <div class="content-image">
+            <div class="content-image" v-if="isShowConfirm === 3">
                 <img src="/img/common/qr_code_hehe.jpg" alt="颜选美学">
             </div>
             <div class="button" id="payButton">
-                <template v-if="isShowConfirm">
-                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleClickOrderSubmitMit">继续提交</a>
-                    <a class="btn cancel" href="javascript:void(0);" @click.stop="handleCloseModel" v-if="isShowConfirm">取消</a>
+                <template v-if="isShowConfirm === 1">
+                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleConfirmOrder">继续提交</a>
+                    <a class="btn cancel" href="javascript:void(0);" @click.stop="handleCloseModel" v-if="isShowConfirm === 1">取消</a>
+                </template>
+                <template v-if="isShowConfirm === 2">
+                    <a class="btn cancel" href="javascript:void(0);" @click.stop="handleConfirmOrder">继续提交</a>
+                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleClickApply">去升级</a>
                 </template>
                 <template v-else>
                     <a class="btn confirm" href="javascript:void(0);" @click.stop="handleCloseModel">了解</a>