营销抽奖活动-签到、报价、出单、承保

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

@@ -335,23 +335,26 @@ public class UnifyOrderManager {
                                     .collect(Collectors.groupingBy(UnifiedUserClientVO::getClientId));
                             // 首先查业务员是否在一账通绑定过本地生活  【已绑定过 远程调抽奖次数增加接口 标记已同步
                             if (userClientGroupMap.containsKey(CLIENT_ID)) {
-                                LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
-                                lotteryCounDTO.setAppUserId(quoteVo.getOrder().getRealQuoteUserId());
-                                lotteryCounDTO.setActivityId(activity.getId());
-                                lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
-                                HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
-                                try {
-                                    lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
-                                } catch (Exception e) {
-                                    log.info("业务员报价，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
-                                    log.error("业务员报价，远程调用本地生活抽奖次数增加异常", e);
-                                }
-                                if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
-                                    // 记录规则完成  标记已同步
-                                    completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
-                                            table.getId(), table.getQutNum(), table.getQutLotteryNum(), table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 6);
+                                int count = insOrdersService.countQuoteNum(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), activity.getActivityStartTime(), activity.getActivityEndTime());
+                                if (count >= Integer.parseInt(table.getQutNum()) && count <= Integer.parseInt(table.getQutLotteryMax())) {
+                                    LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
+                                    lotteryCounDTO.setAppUserId(quoteVo.getOrder().getRealQuoteUserId());
+                                    lotteryCounDTO.setActivityId(activity.getId());
+                                    lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
+                                    HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
+                                    try {
+                                        lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
+                                    } catch (Exception e) {
+                                        log.info("业务员报价，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
+                                        log.error("业务员报价，远程调用本地生活抽奖次数增加异常", e);
+                                    }
+                                    if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
+                                        // 记录规则完成  标记已同步
+                                        completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
+                                                table.getId(), table.getQutNum(), table.getQutLotteryNum(), table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 6);
 
-                                    log.info("业务员报价，满足条件插入记录并远程同步,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
+                                        log.info("业务员报价，满足条件插入记录并远程同步,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
+                                    }
                                 }
                             }
                         }
@@ -397,7 +400,7 @@ public class UnifyOrderManager {
         record.setActivityType(activityType);
         record.setActivityId(activityId);
         record.setLocalActivityTableId(tableId);
-        //报价次数
+        //报价/出单次数/承保费用
         record.setRuleCompleteNum(qutNum);
         //抽奖次数
         record.setLotteryNum(StrUtil.isNotBlank(qutLotteryNum)
@@ -411,8 +414,8 @@ public class UnifyOrderManager {
         record.setUpdateBy(userId);
         insOrdersService.insertActivityCompleteInRule(record);
 
-        log.info("报价规则完成，tenantId={}, userId={}, activityId={}, qutNum={}, qutLotteryNum={}, qutLotteryMax={}",
-                tenantId, userId, activityId, qutNum, qutLotteryNum,  qutLotteryMax);
+        log.info("匹配规则完成，activityType={}, tenantId={}, userId={}, activityId={}, qutNum={}, qutLotteryNum={}, qutLotteryMax={}, userPhone={}",
+                activityType, tenantId, userId, activityId, qutNum, qutLotteryNum,  qutLotteryMax, userPhone);
     }
 
 
@@ -774,21 +777,21 @@ public class UnifyOrderManager {
                                         .collect(Collectors.groupingBy(UnifiedUserClientVO::getClientId));
                                 // 首先查业务员是否在一账通绑定过本地生活  【已绑定过 远程调抽奖次数增加接口 标记已同步
                                 if (userClientGroupMap.containsKey(CLIENT_ID)) {
-                                    LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
-                                    lotteryCounDTO.setAppUserId(insOrders.getRealQuoteUserId());
-                                    lotteryCounDTO.setActivityId(activity.getId());
-                                    lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
-                                    HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
-                                    try {
-                                        lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
-                                    } catch (Exception e) {
-                                        log.info("业务员出单，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", insOrders.getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
-                                        log.error("业务员出单，远程调用本地生活抽奖次数增加异常", e);
-                                    }
-                                    if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
-                                        int count = insOrdersService.countOrderNum(baseController.getUserSystemCode(), insOrders.getRealQuoteUserId(), activity.getActivityStartTime(), activity.getActivityEndTime());
-                                        for (OrderRuleVO orderRule : table.getOrderRules()) {
-                                            if (count >= Integer.parseInt(orderRule.getOrdNum())) {
+                                    int count = insOrdersService.countOrderNum(baseController.getUserSystemCode(), insOrders.getRealQuoteUserId(), activity.getActivityStartTime(), activity.getActivityEndTime());
+                                    for (OrderRuleVO orderRule : table.getOrderRules()) {
+                                        if (count >= Integer.parseInt(orderRule.getOrdNum())) {
+                                            LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
+                                            lotteryCounDTO.setAppUserId(insOrders.getRealQuoteUserId());
+                                            lotteryCounDTO.setActivityId(activity.getId());
+                                            lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
+                                            HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
+                                            try {
+                                                lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
+                                            } catch (Exception e) {
+                                                log.info("业务员出单，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", insOrders.getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
+                                                log.error("业务员出单，远程调用本地生活抽奖次数增加异常", e);
+                                            }
+                                            if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
                                                 // 记录规则完成  标记已同步
                                                 completeRule(baseController.getUserSystemCode(), insOrders.getRealQuoteUserId(), null, activity.getId(),
                                                         table.getId(), table.getQutNum(), table.getQutLotteryNum(), table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 8);

tenant/organization/src/main/java/com/jzg/organization/service/impl/SignInServiceImpl.java

@@ -207,7 +207,8 @@ public class SignInServiceImpl implements SignInService {
                         try {
                             unifiedUserClientVOHttpResult = lotteryActivityService.queryBind(unifiedUserCenterDTO);
                         } catch (Exception e) {
-                            throw new RuntimeException(e);
+                            log.error("签到抽奖，查询用户绑定一账通接口异常,userId:{},clientId:{},tenantId:{}", userId, CLIENT_ID, tenantId);
+                            log.error("签到抽奖，查询用户绑定一账通接口异常", e);
                         }
                         if (unifiedUserClientVOHttpResult == null || unifiedUserClientVOHttpResult.getCode() != 200 || unifiedUserClientVOHttpResult.getData() == null) {
                             // 本地保存
@@ -228,7 +229,8 @@ public class SignInServiceImpl implements SignInService {
                                 try {
                                     lotteryCountVOHttpResult = lotteryActivityService.addLotteryCount(lotteryCounDTO);
                                 } catch (Exception e) {
-                                    throw new RuntimeException(e);
+                                    log.error("签到抽奖，远程调抽奖次数增加接口异常,userId:{},clientId:{},tenantId:{}", userId, CLIENT_ID, tenantId);
+                                    log.error("签到抽奖，远程调抽奖次数增加接口异常", e);
                                 }
                                 if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
                                     // 记录规则完成  标记已同步