支付失败

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.common.utils.StringUtils;
+import com.qs.mp.system.domain.SysUser;
+import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.UserAddr;
 import com.qs.mp.channel.domain.ChannelCart;
 import com.qs.mp.channel.domain.ChannelOrder;
@@ -77,6 +80,9 @@ public class ChannelOrderController extends BaseApiController {
   @Autowired
   private IChannelService channelService;
 
+  @Autowired
+  private ISysUserService sysUserService;
+
   @Autowired
   private RedisCache redisCache;
 
@@ -218,11 +224,15 @@ public class ChannelOrderController extends BaseApiController {
   @PostMapping("/order/pay")
   @ApiOperation(value = "订单支付" , notes = "在订单列表页面支付")
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
-    String openId = SecurityUtils.getLoginUser().getUser().getChannelOpenId();
+    Long userId = SecurityUtils.getLoginUser().getUserId();
+    SysUser sysUser = sysUserService.selectUserById(userId);
+    if (StringUtils.isBlank(sysUser.getChannelOpenId())) {
+      return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+    }
     ChannelOrder channelOrder = channelOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), openId, channelOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), sysUser.getChannelOpenId(), channelOrder.getPayAmt());
     }catch (ServiceException e) {
       return AjaxResult.error(e.getMessage());
     }

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/UserController.java

@@ -119,7 +119,7 @@ public class UserController extends BaseApiController {
       return error("登录失败");
     }
     //更新数据库用户授权信息
-    LoginUser loginUser = hostHolder.getUser();
+    LoginUser loginUser = SecurityUtils.getLoginUser();
     SysUser user = new SysUser();
     user.setUserId(loginUser.getUserId());
     if (wxLoginParams.getIdentity() == UserIdentityEnum.USER.ordinal()) {
@@ -233,7 +233,7 @@ public class UserController extends BaseApiController {
    */
   @RequestMapping(value = "/user/getLoginUserinfo", method = RequestMethod.POST)
   public AjaxResult getLoginUserinfo(@RequestBody JSONObject params) {
-    LoginUser loginUser = hostHolder.getUser();
+    LoginUser loginUser = SecurityUtils.getLoginUser();
 
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("userName", loginUser.getUsername());

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -14,10 +14,13 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
+import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.redis.RedisKey;
 import com.qs.mp.pay.service.IWalletService;
+import com.qs.mp.system.domain.SysUser;
+import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.domain.param.TicketOrderParam;
 import com.qs.mp.user.domain.vo.TicketOrderSettleVO;
@@ -66,6 +69,9 @@ public class UserTicketOrderController extends BaseApiController {
   @Autowired
   private IWalletService walletService;
 
+  @Autowired
+  private ISysUserService sysUserService;
+
   @Autowired
   private MapperFacade mapperFacade;
 
@@ -181,11 +187,15 @@ public class UserTicketOrderController extends BaseApiController {
   @PostMapping("/order/pay")
   @ApiOperation(value = "订单支付" , notes = "在盲票页面支付")
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
-    String openId = SecurityUtils.getLoginUser().getUser().getOpenId();
+    Long userId = SecurityUtils.getLoginUser().getUserId();
+    SysUser sysUser = sysUserService.selectUserById(userId);
+    if (StringUtils.isBlank(sysUser.getOpenId())) {
+      return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+    }
     UserTicketOrder ticketOrder = userTicketOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), openId, ticketOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(), ticketOrder.getPayAmt());
     }catch (ServiceException e) {
       return AjaxResult.error(e.getMessage());
     }

mp-admin/src/test/java/com/qs/mp/service/ServiceImplTest.java

@@ -36,6 +36,12 @@ public class ServiceImplTest {
 
   }
 
+  @Test
+  public void testGenerateShortUrl() {
+    System.out.println(wxUrlLinkService.generate("", "", "wxc3a684f1196f6e15"));
+
+  }
+
   @Test
   public void testGenerateUrlSchema() {
     System.out.println(wxUrlLinkService.generateUrlSchema("/pages/login/invitation", "", "wxc3a684f1196f6e15"));

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxUrlLinkServiceImpl.java

@@ -45,10 +45,10 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     param.put("query", query);
     // 有效时间超过31天的 Link 或永久有效的 Link 为长期有效Link，
     // 单个小程序总共可生成长期有效 Link 上限为10万个，请谨慎调用
-    param.put("is_expire", true);
-    param.put("expire_type", 1);
-    param.put("expire_interval", 30);
-    // 云管铺小程序永久短链接https://wxaurl.cn/YL8D48CQbMr
+    param.put("is_expire", false);
+//    param.put("expire_type", 1);
+//    param.put("expire_interval", 30);
+    // 渠道端票赢天下小程序永久短链接https://wxaurl.cn/rNflbUVrTJn
     // 获取access_token
     String accessToken = appTokenService.getAccessToken(appId);
     String res = HttpUtils.sendPost(