修改bug

Pu Zhibing

2025-12-16 e00543d8fb4eb06cf5f4272fa1df432e5d8f953f

修改bug

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/staff/StaffLiveController.java

@@ -11,6 +11,7 @@
import com.ruoyi.goods.domain.dto.XiaoeLiveQueryDto;
import com.ruoyi.goods.domain.vo.XiaoeLiveVo;
import com.ruoyi.goods.service.biz.XiaoeLiveService;
import com.ruoyi.goods.utils.XiaoeUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -40,6 +41,9 @@

    @Autowired
    private RedisService redisService;

    @Autowired
    private XiaoeUtils xiaoeUtils;

    /**
     * 员工端直播列表
@@ -119,4 +123,12 @@
        map.put("ticket", ticket);
        return R.ok(map);
    }


    @ApiOperation("获取开播口令")
    @PostMapping("/createLivePassword")
    public R<com.alibaba.fastjson2.JSONObject> createLivePassword(String id){
        com.alibaba.fastjson2.JSONObject livePassword = xiaoeUtils.createLivePassword(id);
        return R.ok(livePassword);
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java

@@ -72,6 +72,8 @@
    private static final String COURSE_CHAPTER = "https://api.xiaoe-tech.com/xe.course.course.chapter.get/1.0.0";
    //获取店铺商品分组列表
    private static final String COURSE_GROUP_LIST = "https://api.xiaoe-tech.com/xe.resource_tags.list/1.0.0";
    //获取店铺商品分组列表
    private static final String CREATE_LIVE_PASSWORD = "https://api.xiaoe-tech.com/xe.alive.live_password.create/1.0.0";


    /**
@@ -425,6 +427,30 @@
        }
        return courseChapterVOList;
    }


    /**
     * 获取开播口令
     * @param id
     * @return
     */
    public JSONObject createLivePassword(String id) {
        Map<String, Object> requestParams = new HashMap<>();
        requestParams.put("alive_id", id);
        requestParams.put("access_token", getAccessToken());
        String post = HttpUtil.post(CREATE_LIVE_PASSWORD, JSONObject.toJSONString(requestParams));
        if (StringUtils.isNotBlank(post)) {
            log.info("获取开播口令返回结果：{}" ,post);
            JSONObject jsonObject = JSONObject.parseObject(post);
            if (jsonObject.get("code").equals(0)) {
                JSONObject data = jsonObject.getJSONObject("data");
                return data;
            }
        }
        return null;
    }


    public static void main(String[] args) {
        String urlString = BASE_URL +
                "?app_id=appwmuwNWD48082" +

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -2200,9 +2200,11 @@
        merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
        //判断用户是否绑定  2023-09-05需求改变核销时绑定用户
        if (member.getBindingFlag() != 1) {
            shopId = merVerifyOrderDto.getShopId();
            order.setShopId(shopId);
            //绑定商户
            AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
            appMemberBindingDto.setShopId(order.getShopId());
            appMemberBindingDto.setShopId(shopId);
            appMemberBindingDto.setUserId(order.getUserId());
            appMemberBindingDto.setBindingFlag(1);
            if(order.getOrderFrom()==1){

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/map/MapUtil.java

@@ -24,7 +24,7 @@

    private static Logger logger = LoggerFactory.getLogger(MapUtil.class);

    private static final String tencentKey = "FATBZ-V3AWH-7IJDS-WC7NC-QXY3Q-TQFDJ";
    private static final String tencentKey = "QPABZ-RWPWL-CPZPA-ENZXM-TL4F6-PTBT3";


    /**