Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

@@ -38,6 +38,7 @@ public class TextMsgHandler implements WxMpMessageHandler {
                     .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
                     .build();
         } else {
+            // TODO: 2021/11/25 正常应该是过滤掉 不处理 return null
             return WxMpXmlOutMessage.TEXT().content("您未参与活动或者超过10分钟回复期限，结果为:".concat(wxMessage.getContent()))
                     .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
                     .build();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -170,6 +170,21 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                     // 发放状态
                     receivingStatus = 2;
                 }
+                if (prizeType == 3 || prizeType == 4 || prizeType == 5) {// 优惠券
+                    // 发放优惠券
+                    LinkedList<String> sqls = CollectionUtil.linkedListString();
+                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                    sqls.add(SqlMapping.get("stone_candy_mgt_coupon.add_for_member"));
+                    // TODO: 2021/11/25 换真的手机号 
+                    sqlsDataA.add(new Object[]{
+                            IDGenerator.nextTimeId2(), sweetIntegralActivityPrize.getRelationId(),
+                            sweetIntegralActivityPrize.getPrizeTypeNum(), "15811009011", nowTime, "INTEGRAL_ACTIVITY_DRAW_COUPON", nowTime
+                    });
+                    queueUtils.sendMsgByRedis(MQConst.StoneQueue.STONE_ORDER_COUPON.getKey(),
+                            SqlMapping.gets(sqls, sqlsDataA));
+                    // 发放状态
+                    receivingStatus = 2;
+                }
                 if (prizeType == 1) { // 谢谢惠顾
                     receivingStatus = 3;
                 }