From 0570995736e98716a690251878357c9621a1c4bc Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Sat, 11 Nov 2023 10:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/tool/NoticeController.java  | 12 ++++++++++++
 .../main/resources/templates/system/clew/clew.html   |  4 ++++
 .../main/resources/templates/system/clew/edit.html   |  8 +++++++-
 .../src/main/java/com/ruoyi/system/domain/Clew.java  |  3 +++
 .../src/main/resources/mapper/system/ClewMapper.xml  |  9 ++++++++-
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
index 52c9ab7e..9ebef961 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
@@ -13,6 +13,7 @@ import com.ruoyi.common.utils.ExceptionUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.security.Md5Utils;
+import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.system.domain.ClewPhone;
 import com.ruoyi.system.domain.NoticeRequest;
 import com.ruoyi.system.domain.OppoCheck;
@@ -122,6 +123,17 @@ public class NoticeController {
                     log.info("请求https://api.ads.heytapmobi.com/api/uploadActiveData的属性{}", JSONObject.toJSONString(model));
                     String s = HttpUtils.sendPost("https://api.ads.heytapmobi.com/api/uploadActiveData", JSONObject.toJSONString(model), headerMap);
                     log.info("请求https://api.ads.heytapmobi.com/api/uploadActiveData的响应{}", s);
+                }else if("vivo".equalsIgnoreCase(request.getFrom())){
+                    String token = "78c0170798cf83a7f79ce8fcb5eba68f3329b0e94967686917efcb1dc37e336f";
+                    String timeStamp = System.currentTimeMillis() + "";
+                    String notice = "VIVO"+ (long)((Math.random()+1) * 10000000);
+                    String url = "https://marketing-api.vivo.com.cn/openapi/v1/advertiser/behavior/upload?access_token="+token+"&timestamp="+timeStamp+"&nonce="+notice;
+                    String content = "{\"dataList\":[{\"cvTime\":"+timeStamp+",\"cvType\":\"REGISTER\",\"userId\":\"OTHER\",\"userIdType\":\"OTHER\"}],\"pkgName\":\"com.yinliu.loan\",\"srcId\":\"ds-202310270565\",\"srcType\":\"app\"}";
+                    Map<String, String> headerMap = new HashMap<>();
+                    headerMap.put("Content-Type", "application/json");
+                    log.info("请求{}的属性{}", url, content);
+                    String s = HttpUtils.sendPost(url, content, headerMap);
+                    log.info("请求{}的响应{}", url, s);
                 }else {
                     log.info("短信请求接口入参:{}", request);
                 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
index 56b7283d..f11adb80 100644
--- a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
@@ -114,6 +114,10 @@
                     field: 'remark',
                     title: 'App来源'
                 },
+                {
+                    field: 'customerRemark',
+                    title: '客户情况备注'
+                },
                 {
                     field: 'createTime',
                     title: '创建时间'
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/edit.html b/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
index dc41c021..590b9317 100644
--- a/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
@@ -121,10 +121,16 @@
                 <input name="otherPhone" th:field="*{otherPhone}" class="form-control" type="text">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">客户情况备注：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{customerRemark}" class="form-control" type="text">
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">备注：</label>
             <div class="col-sm-8">
-                <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                <input name="remark" readonly th:field="*{remark}" class="form-control" type="text">
             </div>
         </div>
     </form>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
index de0720e3..b8ab353f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
@@ -124,6 +124,9 @@ public class Clew extends BaseEntity
     @Excel(name = "其他联系方式")
     private String otherPhone;
 
+    @Excel(name = "客户情况备注")
+    private String customerRemark;
+
     private String imei;
 
     private String oaid;
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
index 7b9b6250..8ecd846a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
@@ -36,10 +36,16 @@
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="customerRemark"    column="customer_remark"    />
     </resultMap>
 
     <sql id="selectClewVo">
-        select id, company, sale_id, info_flow, next_time, wx_name, phone, debt_type, debt_money, source_type, source_app, wx_account, customer_status, customer_level, touch_qrcode, contact_number, is_touch, is_add_wx, is_effective, is_plan, is_deal, province_name, city_name, customer_name, contact_time, other_phone, create_time, create_by, update_by, update_time, remark from clew
+        select id, company, sale_id, info_flow, next_time,
+               wx_name, phone, debt_type, debt_money, source_type,
+               source_app, wx_account, customer_status, customer_level, touch_qrcode,
+               contact_number, is_touch, is_add_wx, is_effective, is_plan, is_deal,
+               province_name, city_name, customer_name, contact_time, other_phone,
+               create_time, create_by, update_by, update_time, remark, customer_remark from clew
     </sql>
 
     <select id="selectClewList" parameterType="Clew" resultMap="ClewResult">
@@ -180,6 +186,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="customerRemark != null">customer_remark = #{customerRemark},</if>
         </trim>
         where id = #{id}
     </update>