zhs 3 years ago
parent
commit
8df35c4845

+ 1 - 0
src/main/java/com/supplier/controller/PersonalController.java

@@ -67,6 +67,7 @@ public class PersonalController {
                 Map<String, String> payload = new HashMap<String, String>(){{put("phone", supplier.getPhone());put("code", supplier.getCode());}};
                 // 生成jwt的令牌
                 String token = JWTUtil.getToken(payload);
+                supplier.setCaptcha("null");
                 personalServce.updatePhone(supplier);
                 map.put("data", token);
                 map.put("msg", "200");

+ 4 - 0
src/main/java/com/supplier/model/WxRefund.java

@@ -76,4 +76,8 @@ public class WxRefund implements Serializable {
      * 报价单编号
      */
     private String orderNo;
+    /**
+     * 退款用户编号  发消息用
+     */
+    private String offerCode;
 }

+ 4 - 2
src/main/resources/config/mapping/WxPayMapper.xml

@@ -63,10 +63,11 @@
     <!-- 查询退款信息 -->
     <select id="getUserRefund" resultType="WxRefund">
         SELECT
-            TOP ${limit} a.*,b.offer_name,b.order_no
+            TOP ${limit} a.*,b.offer_name,b.order_no,c.id as offerCode
         FROM
             bus_refund a
             JOIN (select uuid,code,offer_name,jdrq,order_no from bus_supplier_release where code = #{code} GROUP BY uuid,code,offer_name,jdrq,order_no) b on a.release_uuid = b.uuid
+            LEFT JOIN sys_users c on a.code = c.code
         WHERE
             a.id NOT IN
                 (
@@ -90,10 +91,11 @@
     <!-- 查询退款信息 -->
     <select id="getAuditRefund" resultType="WxRefund">
         SELECT
-            TOP ${limit} a.*,b.offer_name,b.order_no
+            TOP ${limit} a.*,b.offer_name,b.order_no,c.id as offerCode
         FROM
             bus_refund a
             JOIN (select uuid,code,offer_name,jdrq,order_no from bus_supplier_release where code = #{code} GROUP BY uuid,code,offer_name,jdrq,order_no) b on a.release_uuid = b.uuid
+            LEFT JOIN sys_users c on a.code = c.code
         WHERE
             a.id NOT IN
             (

+ 3 - 3
src/main/resources/static/css/indexHome/index.css

@@ -53,10 +53,10 @@ body,html{
     display: none;
 }
 .head_portrait{
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
     float: right;
-    margin: 21px 15px 0 0;
+    margin: 25px 15px 0 0;
     cursor: pointer;
     border-radius: 50%;
 }

+ 8 - 8
src/main/resources/static/css/personal/index.css

@@ -316,7 +316,7 @@ body::-webkit-scrollbar-track {/*滚动条里面轨道*/
 }
 .top_up_div{
     display: none;
-    width: 873px;
+    width: 770px;
     height: 700px;
     background: #FFFFFF;
     border-radius: 20px;
@@ -366,7 +366,7 @@ body::-webkit-scrollbar-track {/*滚动条里面轨道*/
     float: left;
     text-align: center;
     height: 80px;
-    width: 148px;
+    width: 125px;
     line-height: 80px;
     margin-right: 28px;
     margin-bottom: 25px;
@@ -433,15 +433,15 @@ body::-webkit-scrollbar-track {/*滚动条里面轨道*/
     width: 100%;
 }
 .top-up-button{
-    width: 407px;
-    height: 69px;
+    width: 307px;
+    height: 60px;
     background: linear-gradient(270deg, #015EEA 0%, #00C0FA 100%);
     box-shadow: 0px 3px 60px 2px rgb(44 135 164 / 15%);
     border-radius: 35px;
     text-align: center;
-    line-height: 69px;
+    line-height: 60px;
     margin: auto;
-    font-size: 26px;
+    font-size: 25px;
     cursor: pointer;
     color: #fff;
 }
@@ -471,7 +471,7 @@ body::-webkit-scrollbar-track {/*滚动条里面轨道*/
 }
 .quotation_number{
     display: none;
-    width: 873px;
+    width: 770px;
     height: 700px;
     background: #FFFFFF;
     border-radius: 20px;
@@ -537,7 +537,7 @@ body::-webkit-scrollbar-track {/*滚动条里面轨道*/
 }
 .select_number_val{
     padding: 0 12px;
-    width: calc(148px - 24px);
+    width: calc(148px - 38px);
     line-height: 50px;
 }
 .number_of_div{

+ 7 - 6
src/main/resources/static/js/demandForSingle/offer/function.js

@@ -275,11 +275,11 @@ function submitAdd(){
     var priceAll = $(".all_price input[name=priceAll]").val(); //总价
     var titleName = $("input[name=offerName]").val();
     var playDay = dateDiffVal($(".start_end_time").html().split(" — ")[0], $(".start_end_time").html().split(" — ")[0]);
-    if((playDay + 1) < $(".timeline").find("li").length){
-        layer.msg("设定天数超出客户游玩天数", {icon: 2, time: 1000});
-        layer.closeAll("loading");
-        return false;
-    }
+    // if((playDay + 1) < $(".timeline").find("li").length){
+    //     layer.msg("设定天数超出客户游玩天数", {icon: 2, time: 1000});
+    //     layer.closeAll("loading");
+    //     return false;
+    // }
     if(titleName == null || titleName == ""){
         layer.msg(paramReturn("请输入报价单名称", parent.type), {icon: 2, time: 1000});
         layer.closeAll("loading");
@@ -419,6 +419,7 @@ function elementDrawing(data){
     $("input[name=offerName]").val(data.data[0].offerName);
     $("input[name=priceDetail]").val(data.data[0].priceDetail);
     $("textarea[name=priceDetailText]").val(data.data[0].priceDetailText);
+    $(".percentage_fee_price").html("平台手续费比例为:"+ proportion +"%,本单手续费为:"+ (data.data[0].priceAll * proportion) +"¥,本单实际收入为:"+ (data.data[0].priceAll - (data.data[0].priceAll * unitPrice)) +"¥");
     contractFile = data.data[0].contractFile
     titleImg = data.data[0].titleImg
     if(data.data[0].other != null){
@@ -1025,7 +1026,7 @@ function getByNumber(){
             unitPrice = data.data.power_unit;
             topUpNum();//次数渲染 余额渲染
             eachNumberAmout(); //次数余额
-            $(".percentage_fee_price").html("平台手续费比例为:"+ data.data.percentage_fee +"%,本单手续费为:"+ (0 * data.data.percentage_fee) +"¥,本单实际收入为:"+ (0 - (0 * data.data.percentage_fee)) +"¥")
+            $(".percentage_fee_price").html("平台手续费比例为:"+ data.data.percentage_fee +"%,本单手续费为:"+ (0 * data.data.percentage_fee).toFixed(2) +"¥,本单实际收入为:"+ (0 - (0 * data.data.percentage_fee)).toFixed(2) +"¥")
             layer.closeAll("loading");
         },
         error: () => {

+ 12 - 3
src/main/resources/static/js/indexHome/function.js

@@ -477,9 +477,18 @@ function languageSelese(obj){
 function clickHeadHove(obj){
     var name = $(obj).text();
     if(name == "退出"){
-        localStorage.clear(); //清空缓存
-        conn.close();
-        window.location.href="/page/Login";
+        layer.confirm("确认退出吗?",{
+            btn: ['确定', '取消'],
+            title: false,
+            skin: 'layclass'
+        }, function () {
+            localStorage.clear(); //清空缓存
+            conn.close();
+            window.location.href="/page/Login";
+        },function (){
+            layer.closeAll()
+        })
+
     } else {
         $(".layui-nav-item").eq(3).addClass("layui-nav-itemed");
         $(".layui-nav-item").eq(3).click();

+ 123 - 44
src/main/resources/static/js/refund/function.js

@@ -34,7 +34,7 @@ function getQuotation(page, limit, startTime, endTime){
                         buttonElem = "<button class=\"ignore_button button_div_head audit_refund\"><img src=\"/images/refund/refused.png\"/><span data-locale=\"yijujue\">"+ paramReturn("已拒绝", parent.type) +"</span></button>\n" +
                             "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/refund/tongyi.png\"/><span data-locale=\"tongyituikuan\">"+ paramReturn("同意退款", parent.type) +"</span></button>\n";
                     }
-                    $(".content_div").append("<div uuid="+ AES_ECB_encrypt(AES_ECB_encrypt(item.releaseUuid, null), null) +" class=\"content_column\">\n" +
+                    $(".content_div").append("<div offerCode="+ item.offerCode +" uuid="+ AES_ECB_encrypt(AES_ECB_encrypt(item.releaseUuid, null), null) +" class=\"content_column\">\n" +
                         "<div class=\"content_div_input\">\n" +
                         "<div class=\"head_name\" style=\"width: 5%;\">"+ (index + 1) +"</div>\n" +
                         "<div class=\"head_name\" style=\"width: 20%;\">"+ item.offerName +"</div>\n" +
@@ -75,55 +75,134 @@ function getQuotation(page, limit, startTime, endTime){
 }
 //同意退款
 function offerClick(obj){
-    layer.load(3);
-    var uuid = $(obj).parent().parent().parent().attr("uuid");
-    $.ajax({
-        url: "/wxRefund/refusedRefund",
-        type: "put",
-        data: {
-            "refundState": "1",
-            "releaseUuid": AES_ECB_decrypt(AES_ECB_decrypt(uuid, null), null)
-        },
-        headers: {"token": localStorage.getItem("token")},
-        dataType: "json",
-        success: (data) => {
-            if(data.msg == "200"){
-                layer.msg(data.data, {icon: 1});
-            } else {
-                layer.msg(data.data, {icon: 2});
+    layer.confirm("确认此操作吗?",{
+        btn: ['确定', '取消'],
+        title: false,
+        skin: 'layclass'
+    }, function () {
+        layer.load(3);
+        var uuid = $(obj).parent().parent().parent().attr("uuid");
+        var offerCode = $(obj).parent().parent().parent().attr("offerCode")
+        console.log(offerCode)
+        sendPrivateText(offerCode);
+        return false;
+        $.ajax({
+            url: "/wxRefund/refusedRefund",
+            type: "put",
+            data: {
+                "refundState": "1",
+                "releaseUuid": AES_ECB_decrypt(AES_ECB_decrypt(uuid, null), null)
+            },
+            headers: {"token": localStorage.getItem("token")},
+            dataType: "json",
+            success: (data) => {
+                if(data.msg == "200"){
+                    layer.msg(data.data, {icon: 1});
+                    sendPrivateText(offerCode);
+                } else {
+                    layer.msg(data.data, {icon: 2});
+                }
+                getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
+                layer.closeAll("loading");
+            },
+            error: () => {
+                layer.alert(paramReturn("服务器异常,请联系管理员", parent.type), {icon: 2});
+                layer.closeAll("loading");
             }
-            getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
-            layer.closeAll("loading");
-        },
-        error: () => {
-            layer.alert(paramReturn("服务器异常,请联系管理员", parent.type), {icon: 2});
-            layer.closeAll("loading");
-        }
-    });
+        });
+    },function (){
+        layer.closeAll()
+    })
 }
 //拒绝
 function ignoreClick(obj){
-    layer.load(3);
-    var uuid = $(obj).parent().parent().parent().attr("uuid");
-    $.ajax({
-        url: "/wxRefund/refusedRefund",
-        type: "put",
-        data: {
-            "refundState": "2",
-            "releaseUuid": AES_ECB_decrypt(AES_ECB_decrypt(uuid, null), null)
-        },
-        headers: {"token": localStorage.getItem("token")},
-        dataType: "json",
-        success: (data) => {
-            layer.closeAll("loading");
-            if(data.msg == "200"){
-                layer.msg(data.data, {icon: 1});
-                getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
+    layer.confirm("确认此操作吗?",{
+        btn: ['确定', '取消'],
+        title: false,
+        skin: 'layclass'
+    }, function () {
+        layer.load(3);
+        var uuid = $(obj).parent().parent().parent().attr("uuid");
+        var offerCode = $(obj).parent().parent().parent().attr("offerCode")
+        $.ajax({
+            url: "/wxRefund/refusedRefund",
+            type: "put",
+            data: {
+                "refundState": "2",
+                "releaseUuid": AES_ECB_decrypt(AES_ECB_decrypt(uuid, null), null)
+            },
+            headers: {"token": localStorage.getItem("token")},
+            dataType: "json",
+            success: (data) => {
+                layer.closeAll("loading");
+                if(data.msg == "200"){
+                    layer.msg(data.data, {icon: 1});
+                    getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
+                    sendPrivateText(offerCode);
+                }
+            },
+            error: () => {
+                layer.alert(paramReturn("服务器异常,请联系管理员", parent.type), {icon: 2});
+                layer.closeAll("loading");
             }
+        });
+    },function (){
+        layer.closeAll()
+    })
+}
+//注册并登录环信账号
+function registerUser(){
+    var options = {
+        username: parent.username.toLowerCase(),
+        password: '123456',
+        nickname: parent.nickname,
+        appKey: WebIM.config.appkey,
+        success: function () { },
+        error: function (err) {
+            let errorData = JSON.parse(err.data);
         },
-        error: () => {
-            layer.alert(paramReturn("服务器异常,请联系管理员", parent.type), {icon: 2});
-            layer.closeAll("loading");
+    };
+    conn.registerUser(options);
+
+    var options1 = {
+        user: parent.username.toLowerCase(),
+        pwd: '123456',
+        appKey: WebIM.config.appkey
+    };
+    conn.open(options1);
+    //
+    setTimeout(function (){
+        let options = {
+            nickname: parent.nickname,
+            avatarurl: parent.headImg,
+        }
+        //修改用户信息
+        conn.updateOwnUserInfo(options);
+        //查询列表
+        conn.getSessionList().then((res) => {
+
+        })
+    },2000);
+}
+// 单聊发送文本消息
+function sendPrivateText(offerCode) {
+    if(typeof offerCode == "null"){
+        console.log("发送消息失败")
+        return false;
+    }
+    let id = conn.getUniqueId();                 // 生成本地消息id
+    let msg = new WebIM.message('txt', id);      // 创建文本消息
+    msg.set({
+        msg: '我已对您的退款申请进行了操作,请注意查看',                         // 消息内容
+        to: offerCode,                          // 接收消息对象(用户id)
+        chatType: 'singleChat',              // 设置为单聊
+        success: function (id, serverMsgId) {
+
+        },
+        fail: function(e){
+            console.log("失败");
         }
     });
+    conn.send(msg.body);
+    $(".chat__room-info-input textarea").val("");
 }

+ 1 - 0
src/main/resources/static/js/refund/index.js

@@ -28,4 +28,5 @@ layui.use(["layer", "form", "laydate", 'laypage'], function(){
     });
     getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
     translationVal(parent.type);//翻译
+    registerUser();//登录即时通讯
 })

+ 1 - 1
src/main/resources/templates/indexHome.html

@@ -67,7 +67,7 @@
                 <!-- 消息数量 -->
                 <div class="message_num">0</div>
                 <!-- 消息图片 -->
-                <img src="/images/indeHome/message.png"/>
+                <img src="/images/indeHome/message.png" style="width: 35px;"/>
             </div>
         </div>
         <!-- 左侧菜单 -->

+ 5 - 0
src/main/resources/templates/refund/index.html

@@ -11,6 +11,11 @@
     <link rel="stylesheet" href="/css/refund/index.css">
     <script src="/js/crypto-js.js" type="text/javascript"></script>
     <script src="/js/custom.js" type="text/javascript"></script>
+    <script src="/js/webIm/WebIMConfig.js"></script>
+    <script src="/js/webIm/Easemob-chat-4.0.2.js"></script>
+    <script src="/js/clipboard.min.js"></script>
+    <script src="/js/webIm/initWeb.js"></script>
+    <script src="/js/huanxin.js"></script>
     <script src="/js/refund/even.js" type="text/javascript"></script>
     <script src="/js/refund/index.js" type="text/javascript"></script>
     <script src="/js/refund/function.js" type="text/javascript"></script>