Merge remote-tracking branch 'origin/master'

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

@@ -334,10 +334,6 @@ public class UnifyOrderManager {
             insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
             log.info("报价返回：{}", JSON.toJSONString(quoteResultsVo));
 
-            // 处理营销抽奖活动（报价规则 type=6），异常不影响主报价流程
-            handleQuoteLotteryActivity(quoteVo);
-
-
         } catch (Exception e) {
             log.error("车险报价异常", e);
             Throwable root = e.getCause() != null ? e.getCause() : e;
@@ -352,6 +348,9 @@ public class UnifyOrderManager {
                 log.error("更新报价失败状态异常, ordersNo: {}", ordersNo, ex);
             }
             throw new SystemException(errMsg);
+        }finally {
+            // 处理营销抽奖活动（报价规则 type=6），异常不影响主报价流程
+            handleQuoteLotteryActivity(quoteVo);
         }
         return quoteResultsVo.getQuoteStatusEnum()
                 .equals(InsOrderStatusEnum.WAIT_AUDIT) ? HttpResult.ok(quoteResultsVo) : HttpResult.error(500, quoteResultsVo, quoteResultsVo.getErrorMessage());
@@ -604,16 +603,15 @@ public class UnifyOrderManager {
             return;
         }
         // 防止同一次报价重复执行时重复远程发放；这里用当天报价次数作为防重维度。
-        SysUserActivityCompleteInRule exist = insOrdersService.selectByRule(
+        /*SysUserActivityCompleteInRule exist = insOrdersService.selectByRule(
                 tenantId, userId, activity.getId(), String.valueOf(count), 6);
         if (exist != null) {
             return;
         }
-        HttpResult<SysUserJzgInfo> sysUser = orgClient.queryUserByUserId(userId,tenantId);
+        HttpResult<SysUserJzgInfo> sysUser = orgClient.queryUserByUserId(userId,tenantId);*/
 
         // 满足条件，远程调用抽奖次数增加接口，只发放本次新增次数。
         LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
-        lotteryCounDTO.setAppUserId(userId);
         lotteryCounDTO.setActivityId(activity.getId());
         lotteryCounDTO.setCount(currentGrantNum);
         lotteryCounDTO.setPhone(userId);
@@ -627,7 +625,7 @@ public class UnifyOrderManager {
             log.error("业务员报价，远程调用本地生活抽奖次数增加异常", e);
         }
 
-        if (lotteryResult != null && lotteryResult.getData().getSuccess()) {
+        if (lotteryResult != null) {
             completeRule(tenantId, userId, null, activity.getId(),
                     table.getId(), String.valueOf(count), String.valueOf(currentGrantNum),
                     table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 6);
@@ -1200,9 +1198,9 @@ public class UnifyOrderManager {
         // 满足条件，远程调用抽奖次数增加接口
         int qutLotteryNum = Integer.parseInt(table.getQutLotteryNum());
         LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
-        lotteryCounDTO.setAppUserId(userId);
         lotteryCounDTO.setActivityId(activity.getId());
         lotteryCounDTO.setCount(qutLotteryNum);
+        lotteryCounDTO.setPhone(userId);
 
         HttpResult<LotteryCountVO> lotteryResult = null;
         try {
@@ -1212,7 +1210,7 @@ public class UnifyOrderManager {
                     userId, table.getQutLotteryNum(), tenantId);
             log.error("业务员出单，远程调用本地生活抽奖次数增加异常", e);
         }
-        if (lotteryResult != null && lotteryResult.getData().getSuccess()) {
+        if (lotteryResult != null ) {
             MessageAddParam param = new MessageAddParam();
             param.setTitle("抽奖次数下发通知消息");
             param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"出单活动:抽奖次数奖励下发\"}");