合并代码

puzhibing

2024-12-10 7cbb9f42f6f9430aae846ae25b7ad77a82528927

合并代码

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java

@@ -32,7 +32,7 @@

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
@@ -77,7 +77,7 @@
    private String idStr;


    public void setId(Integer id) {
    public void setId(Long id) {
        this.id = id;
        this.idStr = String.valueOf(id);
    }

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

@@ -201,7 +201,7 @@
    public void writeOff(String code,Integer shopId) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
                .eq(Order::getOrderNumber, code));
                .eq(Order::getId, code));
        boolean check = check(order, shopId, loginUserApplet.getUserid());
        if (!check){
            throw new ServiceException("订单不存在");