Merge branch 'master' of zyh/kmall-haikong into master

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

@@ -298,7 +298,7 @@
                                         <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
                                         <button type="button" class="btn btn-primary" @click="queryIDCardInfo">查询身份信息</button>
                                         <button type="button" class="btn btn-primary" @click="getIDCardInfo" id="IDCard">读取身份证信息</button>
-                                        <button type="button" class="btn btn-primary" @click="submitCustomInfo" id="Send">去付款</button>
+                                        <button type="button" class="btn btn-primary" @click="idCardVerification" id="Send" style="background-color:red;">去付款</button>
                                     </div>
                                 </div>
                             </div>
@@ -337,17 +337,19 @@
                                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                                         <h4 class="modal-title" id="payModalLabel">付款码</h4>
                                     </div>
+
                                     <div class="modal-body">
-                                        <div style="margin-bottom: 50px">
-                                            <ul style="display: inline-block">
-                                                <li><h5 style="border: white;padding: 8px;">总件数:{{totalCount}}</h5></li>
-                                                <li><h5 style="border: white;padding: 8px;">总价:{{totalPrice}}</h5></li>
-                                                <li><h5 style="border: white;padding: 8px;color: red;">实际支付价:{{actualPrice}}</h5></li>
+                                        <div style="margin-bottom: 50px;">
+                                            <ul style="display: inline-block;">
+                                                <li><h5 style="border: white; padding: 5px; color: red; font-size: 35px;">实付款:{{actualPrice}}</h5></li>
+                                                <li><h5 style="border: white; padding: 8px;">总件数:{{totalCount}}</h5></li>
+                                                <li><h5 style="border: white; padding: 8px;">总价:{{totalPrice}}</h5></li>
+                                                <li><h5 style="border: white; padding: 8px;">抵扣积分:{{deductionScore}}</h5></li>
                                             </ul>
-                                            <ul style="display: inline-block">
-                                                <li><h5 style="border: white;padding: 8px">会员等级:{{levelName}}</h5></li>
-                                                <li><h5 style="border: white;padding: 8px">会员当前积分:{{memberCurrentAvailableScore}}</h5></li>
-                                                <li><h5 style="border: white;padding: 8px">抵扣积分:{{deductionScore}}</h5></li>
+                                            <ul style="display: inline-block;">
+                                                <li><h5 style="border: white; padding: 8px;"></h5></li>
+                                                <li><h5 style="border: white; padding: 8px;">会员等级:{{levelName}}</h5></li>
+                                                <li><h5 style="border: white; padding: 8px;">会员当前积分:{{memberCurrentAvailableScore}}</h5></li>
                                             </ul>
                                         </div>
                                         <form>

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

@@ -1400,7 +1400,45 @@ let vm = new Vue({
                     this.$refs.payCode.focus();
                 }, 200);
             })
+        },
+        /**
+         * 2021/12/27
+         * 实名认证
+         */
+        idCardVerification:function (){
+            var custimName=this.$refs.customName.value;
+            var customIDCard=this.$refs.customIDCard.value;
+            if (custimName==''){
+                alert("请输入姓名");
+                return;
+            }
+            if (customIDCard==''){
+                alert("请输入身份证");
+                return;
+            }
+            $.ajax({
+                type: "POST",
+                url: "../api/index/idCardVerification",
+                contentType: "application/json",
+                data: JSON.stringify({'idNo':customIDCard,'userName':custimName}),
+                success: function (r) {
+                    if (r.errno==0){
+                        //实名认证成功则调用去付款方法
+                        $('#myModal').modal('hide');
+                        vm.submitCustomInfo();
+                    }else{
+                        alert(r.errmsg)
+                        $('#myModal').modal('show');
+                        return;
+                    }
+
+
+                }
+            });
+
         }
+
+
     }
 });
 

kmall-api/src/main/java/com/kmall/api/api/ApiIndexController.java

@@ -139,6 +139,28 @@ public class ApiIndexController extends ApiBaseAction {
             return toResponsFail("系统异常");
         }
     }
+
+    /**
+     *  实名认证
+     * @param
+     * @return
+     */
+    @RequestMapping("idCardVerification")
+    @IgnoreAuth
+    public Object idCardVerification(){
+        //实名认证身份证信息
+        JSONObject jsonParam = getJsonRequest();
+        String idNo = jsonParam.getString("idNo");
+        String userName = jsonParam.getString("userName");
+        String result = IdCardUtil.checkIdCard(idNo, userName);
+        logger.info("idcard check result:"+result);
+        IdCardMsgVo vo = JSON.parseObject(result,IdCardMsgVo.class);
+        if(vo.getRespCode().equalsIgnoreCase("0000")){
+            return toResponsMsgSuccess("实名认证成功");
+        }else{
+            return toResponsFail(vo.getRespMessage());
+        }
+    }
     public static void main(String[] args) {
 
     }