Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -419,6 +419,7 @@ public class UnifyOrderManager {
      * @param quoteVo 报价请求参数
      */
     private void handleQuoteLotteryActivity(QuoteVo quoteVo) {
+        log.info("进入营销活动报价抽奖，参数：{}",JSON.toJSONString(quoteVo));
         try {
             // 远程调用活动列表
             List<LocalLivingLotteryActivityVO> activities = queryLotteryActivities(lotteryScene);
@@ -452,7 +453,7 @@ public class UnifyOrderManager {
 
                     // 查询用户是否在一账通绑定过本地生活
                     HttpResult<UnifiedUserClientVO> bindResult = queryUserBind(userId,quoteUserId, tenantId);
-                    if (bindResult == null || bindResult.getCode() != 200 || bindResult.getData() == null) {
+                    if (bindResult == null || bindResult.getCode() != 0 || bindResult.getData() == null) {
                         // 未绑定：统计报价次数，满足条件则存本地记录
                         handleUnboundQuoteRule(tenantId, quoteUserId, activity, table);
                     } else {
@@ -535,7 +536,7 @@ public class UnifyOrderManager {
 
         MessageAddParam param = new MessageAddParam();
         param.setTitle("抽奖次数下发通知消息");
-        param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"抽奖次数奖励下发\"}");
+        param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"报价活动:抽奖次数奖励下发\"}");
         param.setTplCode("template_13");
         param.setReceive(List.of(userId));
         orgClient.messageAdd(param);
@@ -635,7 +636,7 @@ public class UnifyOrderManager {
             // 发送抽奖次数下发通知消息
             MessageAddParam param = new MessageAddParam();
             param.setTitle("抽奖次数下发通知消息");
-            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"抽奖次数奖励下发\"}");
+            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"报价活动:抽奖次数奖励下发\"}");
             param.setTplCode("template_13");
             param.setReceive(List.of(userId));
             orgClient.messageAdd(param);
@@ -1149,7 +1150,7 @@ public class UnifyOrderManager {
 
                 MessageAddParam param = new MessageAddParam();
                 param.setTitle("抽奖次数下发通知消息");
-                param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"抽奖次数奖励下发\"}");
+                param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"出单活动:抽奖次数奖励下发\"}");
                 param.setTplCode("template_13");
                 param.setReceive(List.of(userId));
                 orgClient.messageAdd(param);
@@ -1213,7 +1214,7 @@ public class UnifyOrderManager {
         if (lotteryResult != null && lotteryResult.getData().getSuccess()) {
             MessageAddParam param = new MessageAddParam();
             param.setTitle("抽奖次数下发通知消息");
-            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"抽奖次数奖励下发\"}");
+            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"出单活动:抽奖次数奖励下发\"}");
             param.setTplCode("template_13");
             param.setReceive(List.of(userId));
             orgClient.messageAdd(param);