jsticket签名返回书本信息

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ImageCatelogController.java

@@ -5,6 +5,8 @@ import com.wwdz.ch.admin.service.ImageCatelogDetailService;
 import com.wwdz.ch.admin.service.ImageCatelogService;
 import com.wwdz.ch.core.api.OfficialAccountApi;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.distribution.ImageCatelogDao;
+import com.wwdz.ch.db.domain.distribution.ImageCatelog;
 import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -15,6 +17,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/admin/imageCatelog")
 public class ImageCatelogController {
@@ -30,6 +35,9 @@ public class ImageCatelogController {
     @Autowired
     OfficialAccountApi officialAccountApi;
 
+    @Autowired
+    ImageCatelogDao imageCatelogDao;
+
     @ApiOperation(value = "查询图录列表")
     @PostMapping("/find")
     public Result find(@RequestBody ImageCatelogRequestDto dto) {
@@ -50,6 +58,15 @@ public class ImageCatelogController {
     @PostMapping("/createSignature")
     public Result createSignature(@RequestBody ImageCatelogRequestDto dto) {
         logger.info("分享图录生成签名信息,请求参数:{}", JSON.toJSONString(dto));
-        return officialAccountApi.getSignature(dto.getShareUrl());
+        Result result = officialAccountApi.getSignature(dto.getShareUrl());
+        if (result.getSuccess()) {
+            Map<String, Object> map = (Map<String, Object>) result.getData();
+            ImageCatelog imageCatelog = imageCatelogDao.findById(dto.getId());
+            if (imageCatelog != null) {
+                map.put("bookInfo", imageCatelog);
+                return Result.success(map);
+            }
+        }
+        return Result.failed();
     }
 }

ch-core/src/main/java/com/wwdz/ch/core/api/OfficialAccountApi.java

@@ -4,6 +4,8 @@ import com.wwdz.ch.core.entity.ConsignSaleSubscribeMsg;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.OkHttpUtil;
 import com.wwdz.ch.core.util.RedisUtils;
+import com.wwdz.ch.db.dao.distribution.ImageCatelogDao;
+import com.wwdz.ch.db.domain.distribution.ImageCatelog;
 import com.xxdxxs.utils.JsonUtils;
 import com.xxdxxs.utils.StringUtils;
 import org.slf4j.Logger;
@@ -61,6 +63,8 @@ public class OfficialAccountApi {
     @Autowired
     RedisUtils redisUtils;
 
+
+
 /*    @Autowired
     WxLoginManager wxLoginManager;*/
 
@@ -215,7 +219,7 @@ public class OfficialAccountApi {
     public Result getSignature(String url) {
         try {
             String ticket = getJsapiTicket();
-            Map<String, String> map = new HashMap();
+            Map<String, Object> map = new HashMap();
             String nonce_str = create_nonce_str();
             String timestamp = create_timestamp();
             //注意这里参数名必须全部小写，且必须有序