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

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponBuildParam.java

@@ -28,7 +28,7 @@ public class CandyMgtCouponBuildParam {
     @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券｜101-优先券]", allowableValues = "1,2,3,4,101")
     private Integer couType;
     @NotNull(message = "券领取方式不能为空")
-    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户｜2-积分商品｜3-发送需领取]", allowableValues = "0,1,2,3")
+    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户｜2-积分商品｜3-发送需领取｜4-会员专属]", allowableValues = "0,1,2,3,4")
     private Integer bindType;
     @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
     private BigDecimal discount;

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyCouponVo.java

@@ -29,7 +29,7 @@ public class CandyCouponVo implements Serializable, Cloneable {
     private Integer busiType;
     @ApiModelProperty(value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券 | 101-优先券]",example = "1")
     private Integer couType;
-    @ApiModelProperty(value = "[0-用户输入兑换｜1-发放至用户]",example = "1")
+    @ApiModelProperty(value = "[0-用户输入兑换｜1-发放至用户｜2-积分兑换｜3-发放需领取｜4-会员专属]",example = "1")
     private Integer bindType;
     @ApiModelProperty(value = "折扣 可null",example = "0.5")
     private BigDecimal discount;

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

@@ -33,8 +33,7 @@ public class StrawberryPosterHandler implements WxMpMessageHandler {
                                     WxSessionManager sessionManager) throws WxErrorException {
         redisUtils.setStrawberryPosterClick(wxMessage.getFromUser(), 10 * 60);
 
-        // TODO: 2021/11/25 线上改成正规文案
-        return WxMpXmlOutMessage.TEXT().content("您已进入活动，请回复姓名，zhengzai.tv, 10分钟内回复有效")
+        return WxMpXmlOutMessage.TEXT().content("您已进入活动，请回复姓名, 10分钟内回复有效")
                 .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
                 .build();
     }

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

@@ -10,6 +10,7 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,26 +38,25 @@ public class TextMsgHandler implements WxMpMessageHandler {
     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
                                     WxSessionManager sessionManager) throws WxErrorException {
         boolean IsPosterClick = redisUtils.getStrawberryPosterClick(wxMessage.getFromUser());
-        // TODO: 2021/11/25 线上改成正规模版消息
         if (IsPosterClick) {
-            // test 小程序卡片
+            String content = wxMessage.getContent();
+            // 发送文本消息
+            WxMpXmlOutTextMessage build = WxMpXmlOutMessage.TEXT().content("您已参与活动，输入的姓名为:".concat(content).concat(" 请点击下方小程序参加活动"))
+                    .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+                    .build();
+            // 发送活动小程序卡片
             WxMpKefuMessage message = WxMpKefuMessage.MINIPROGRAMPAGE()
                     .appId(maConfigure.getWxMaAppid(4))
-                    .pagePath("/pages/index")
+                    .pagePath("/pages/index?nickname=".concat(content))
                     .thumbMediaId("ov08q51In7bXX6tXv7FewxFNN0G78n-pPRsbi3LZbPE")
                     .title("正在摩登")
                     .toUser(wxMessage.getFromUser())
                     .build();
             wxMpService.getKefuService().sendKefuMessage(message);
-
-            return WxMpXmlOutMessage.TEXT().content("您已参与活动，结果为:".concat(wxMessage.getContent()))
-                    .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
-                    .build();
+            return build;
         } else {
-            // TODO: 2021/11/25 正常应该是过滤掉 不处理 return null
-            return WxMpXmlOutMessage.TEXT().content("您未参与活动或者超过10分钟回复期限，结果为:".concat(wxMessage.getContent()))
-                    .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
-                    .build();
+            // 正常消息不处理
+            return null;
         }
     }
 }