Merge branch 'pre' into 'master'

修改 imgurl没入库的问题

See merge request !132

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatMaoDengController.java

@@ -58,9 +58,8 @@ public class SweetWechatMaoDengController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "imgUrl", value = "imgUrl"),
     })
     public ResponseDto addBuilderImg(@RequestParam(value = "userId", required = false) String userId,
-                                     @RequestParam(value = "imgUrl", required = false) String imgUrl,
-                                     @RequestParam(value = "maoId", required = false) String maoId) {
-        return sweetWechatMaoDengService.addBuilderImg(userId, imgUrl, maoId);
+                                     @RequestParam(value = "imgUrl", required = false) String imgUrl) {
+        return sweetWechatMaoDengService.addBuilderImg(userId, imgUrl);
     }
 
 }

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

@@ -90,7 +90,7 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
                 sweetMaoDengVo.setTextMsg(textMsg);
             }
 
-            String maoId = IDGenerator.nextSnowId();
+            sweetMaoDengVo.setMaoId(IDGenerator.nextSnowId());
             redisUtils.setSweetMaoDeng(sweetMaoDengVo);
 
             if (StringUtil.isNotEmpty(textMsg) && StringUtil.isNotEmpty(picUrl)) {
@@ -98,7 +98,7 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert"));
-                sqlsDataA.add(new Object[]{maoId, fromUser, textMsg, picUrl, "", LocalDateTime.now()});
+                sqlsDataA.add(new Object[]{sweetMaoDengVo.getMaoId(), fromUser, textMsg, picUrl, "", LocalDateTime.now()});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }
 
@@ -108,7 +108,7 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
             // 发送活动小程序卡片
             WxMpKefuMessage message = WxMpKefuMessage.MINIPROGRAMPAGE()
                     .appId(maConfigure.getWxMaAppid(4))
-                    .pagePath("pages/webview?query=catActivity&maoId=" + maoId) //小程序路径
+                    .pagePath("pages/webview?query=catActivity") //小程序路径
 //                    .thumbMediaId("ov08q51In7bXX6tXv7Few-ud2-J-hyXnDC5NCNSfc_4") // 正在
 //                    .thumbMediaId("ttUDFdcsOTnGFPBt5xp-vaYe_hS9Jae5C_YUboXmb4c") //test
                     .thumbMediaId("OFjnPjluDGoHH1KOAdxQ_iMyWpBe_c48V40LlN6VmAQ") //图片地址

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

@@ -30,7 +30,7 @@ public class SweetWechatMaoDengServiceImpl {
     @Autowired
     WechatMaConfigure maConfigure;
 
-    public ResponseDto addBuilderImg(String userId, String imgUrl, String maoId) {
+    public ResponseDto addBuilderImg(String userId, String imgUrl) {
         LocalDateTime localDateTime = LocalDateTime.now(); //生成创建时间
         try {
             SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 2);
@@ -45,12 +45,15 @@ public class SweetWechatMaoDengServiceImpl {
             String picUrl = sweetMaoDeng.getPicUrl();
             sweetMaoDeng.setCreatedAt(localDateTime);
             redisUtils.setSweetMaoDeng(sweetMaoDeng);
+            if (sweetMaoDeng.getMaoId() == null) {
+                sweetMaoDeng.setMaoId("0");
+            }
             if (StringUtil.isNotEmpty(textMsg) && StringUtil.isNotEmpty(picUrl)) {
                 //redis队列入库
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.img.update"));
-                sqlsDataA.add(new Object[]{imgUrl, userId, maoId});
+                sqlsDataA.add(new Object[]{imgUrl, userId, sweetMaoDeng.getMaoId()});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
                 return ResponseDto.success("请求成功");
             }