jinshihui hai 6 días
pai
achega
48fce61cad

+ 1 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -214,12 +214,11 @@ public class TJsController extends BaseController {
     /**
     /**
      * 微信查询技师列表(用户端)
      * 微信查询技师列表(用户端)
      *
      *
-     * @param page
+     * @param page 分页参数
      * @param js
      * @param js
      * @return R 技师列表
      * @return R 技师列表
      */
      */
     @RequestMapping(value = "wx/select", method = RequestMethod.GET)
     @RequestMapping(value = "wx/select", method = RequestMethod.GET)
-    //@Log(title = "微信查询技师列表", businessType = BusinessType.OTHER)
     @ApiOperation("微信查询技师列表")
     @ApiOperation("微信查询技师列表")
     public R wxSelect(Page<TJs> page, TJsVo js) {
     public R wxSelect(Page<TJs> page, TJsVo js) {
         try {
         try {

+ 0 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -64,7 +64,6 @@ public class TOrderController extends BaseController {
      * @param order
      * @param order
      * @return R<TOrder>
      * @return R<TOrder>
      */
      */
-    //@Log(title = "新增订单", businessType = BusinessType.INSERT)
     @ApiOperation("下单")
     @ApiOperation("下单")
     @RequestMapping(value = "wx/add", method = RequestMethod.POST)
     @RequestMapping(value = "wx/add", method = RequestMethod.POST)
     public R<TOrder> add(@RequestBody TOrder order) {
     public R<TOrder> add(@RequestBody TOrder order) {

+ 9 - 4
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WeChatController.java

@@ -418,10 +418,15 @@ public class WeChatController extends BaseController {
     @ApiOperation("获取公众号二维码")
     @ApiOperation("获取公众号二维码")
     @RequestMapping(value = "getwxQrCode", method = RequestMethod.GET)
     @RequestMapping(value = "getwxQrCode", method = RequestMethod.GET)
     public Map<?, ?> getWxQrCodeUtil(@RequestParam String openId) {
     public Map<?, ?> getWxQrCodeUtil(@RequestParam String openId) {
-        //获取access_token
-        String token = weChatUtil.getToken();
-        //获取的二维码ticket
-        return weChatUtil.getTicket(token, openId);
+        try {
+            //获取access_token
+            String token = weChatUtil.getToken();
+            //获取的二维码ticket
+            return weChatUtil.getTicket(token, openId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
     }
 
 
     @ApiOperation("获取JS公众号二维码ticket")
     @ApiOperation("获取JS公众号二维码ticket")

+ 2 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/utils/WeChatUtil.java

@@ -243,7 +243,8 @@ public class WeChatUtil {
      * 生成公众号码ticket
      * 生成公众号码ticket
      *
      *
      * @param token access_token
      * @param token access_token
-     * @return 返回包含微信公众号码ticket的Map
+     * @param openId
+     * @return Map<?, ?> 返回包含微信服务号ticket的Map
      */
      */
     public Map<?, ?> getTicket(String token, String openId) {
     public Map<?, ?> getTicket(String token, String openId) {
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token;
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token;