Merge remote-tracking branch 'origin/master'

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -289,7 +289,10 @@ public class QwMsgController {
                 log.info("id:{}, 需要二次验证:"+wxWorkMsgResp.getJson(), id);
 
                 redisCache.setCacheObject("qrCodeUid:"+wxWorkMsgResp.getUuid(),100012,10, TimeUnit.MINUTES);
-
+                QwUser qwUser1 = qwUserMapper.selectQwUserById(id);
+                if(qwUser1.getUid().equals(wxWorkMsgResp.getUuid())){
+                    qwUserService.atMsg(qwUser1, "需要二次验证（在销售后台，企微员工页面点击二次验证）");
+                }
                 break;
             case 100005:
 

fs-service/src/main/java/com/fs/config/ai/AiHostProper.java

@@ -20,6 +20,9 @@ public class AiHostProper {
     @Value("${ipad.commonApi}")
     private String commonApi;
 
+    @Value("${ipad.aiApiV2:http://1.95.196.10:3000/api}")
+    private String aiApiV2;
+
 
 
 }

fs-service/src/main/java/com/fs/crm/utils/CrmCustomerAiTagUtil.java

@@ -145,7 +145,7 @@ public class CrmCustomerAiTagUtil {
             ChatService chatService = SpringUtils.getBean(ChatService.class);
             AiHostProper aiHost = SpringUtils.getBean(AiHostProper.class);
 
-            return chatService.initiatingTakeChat(param, aiHost.getAiApi(), appKey);
+            return chatService.initiatingTakeChat(param, aiHost.getAiApiV2(), appKey);
         } catch (Exception e) {
             throw new RuntimeException("AI服务调用失败", e);
         }

fs-service/src/main/java/com/fs/his/mapper/FsUserIntegralLogsMapper.java

@@ -72,9 +72,12 @@ public interface FsUserIntegralLogsMapper
      */
     public int deleteFsUserIntegralLogsByIds(Long[] ids);
     @Select({"<script> " +
-            "select l.*,u.nick_name,u.phone from fs_user_integral_logs l LEFT JOIN fs_user u ON u.user_id=l.user_id "+
+            "select l.id,l.user_id,l.log_type,l.integral,l.balance,l.business_id,l.create_time,l.business_type,l.status,u.nick_name,u.phone " +
+            "from fs_user_integral_logs l " +
+            "LEFT JOIN fs_user u ON u.user_id=l.user_id "+
             " <where>  \n" +
             "            <if test=\"userId != null \"> and l.user_id = #{userId}</if>\n" +
+            "            <if test=\"nick_name != null \"> and u.nick_name = #{nickName}</if>\n" +
             "            <if test=\"logType != null  and logType != ''\"> and log_type = #{logType}</if>\n" +
             "            <if test=\"phone != null \"> and u.phone = #{phone}</if>\n" +
             "            <if test=\"businessId != null  and businessId != ''\"> and business_id = #{businessId}</if>\n" +

fs-service/src/main/resources/application-config-dev.yml

@@ -126,6 +126,7 @@ ipad:
   aiApi: http://1.95.196.10:3000/api
   voiceApi:
   commonApi:
+  aiApiV2: http://1.95.196.10:3000/api
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:
@@ -138,7 +139,8 @@ jst:
   authorization_code: 666666
   shop_code: "18461733"
 weizou:
-  baseUrl: http://113.105.104.56:9620
+#  baseUrl: http://113.105.104.56:9620
+  baseUrl: https://test-api.weizou.com:9702/
 #  appId:
 #  appSecret:
 #  createName:

fs-service/src/main/resources/application-config-druid-sxjz.yml

@@ -102,6 +102,7 @@ ipad:
   wxIpadUrl:
   voiceApi:
   commonApi:
+  aiApiV2: http://1.95.196.10:3000/api
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

fs-service/src/main/resources/mapper/qw/QwUserMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="videoGetStatus"    column="video_get_status"    />
         <result property="updateTime"    column="update_time"    />
         <result property="aiStatus"    column="ai_status"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectQwUserVo">
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ipad_status,config_id,vid,uid,contact_way,app_key, qw_user_name, department,
                openid, company_id, company_user_id, corp_id, status, is_del, welcome_text,
                welcome_image, is_send_msg,app_key,qw_hook_id,fastGpt_role_id,login_status,
-               tool_status,login_code_url,version,update_time,ai_status from qw_user
+               tool_status,login_code_url,version,update_time,ai_status,remark from qw_user
         </sql>
 
     <select id="selectQwUserList" parameterType="QwUser" resultMap="QwUserResult">
@@ -189,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isAuto != null">is_auto = #{isAuto},</if>
             <if test="videoGetStatus != null">video_get_status = #{videoGetStatus},</if>
             <if test="aiStatus != null">ai_status = #{aiStatus},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>