直播订单openid调整

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -2910,12 +2910,16 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 storePayment.setPayTypeCode("weixin");
                 storePayment.setBusinessType(5);
                 storePayment.setRemark("直播订单支付");
-                Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
-                        .eq(FsUserWx::getFsUserId, order.getUserId())
-                        .eq(FsUserWx::getAppId, fsPayConfig.getAppId());
-                FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
-                log.info("查到的openId信息：{}", fsUserWx);
-                storePayment.setOpenId(fsUserWx == null ? user.getMaOpenId() : fsUserWx.getOpenId());
+                if(StringUtils.isNotEmpty(user.getMaOpenId())){
+                    storePayment.setOpenId(user.getMaOpenId());
+                }else{
+                    Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
+                            .eq(FsUserWx::getFsUserId, order.getUserId())
+                            .eq(FsUserWx::getAppId, fsPayConfig.getAppId());
+                    FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
+                    log.info("查到的openId信息：{}", fsUserWx);
+                    storePayment.setOpenId(fsUserWx.getOpenId());
+                }
                 log.info("用户openid：{}", storePayment.getOpenId());
                 storePayment.setUserId(user.getUserId());
                 storePayment.setBusinessId(String.valueOf(order.getOrderId()));