Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

 oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java

@@ -10,6 +10,8 @@
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import java.util.List;

import org.apache.poi.util.Beta;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -100,31 +102,33 @@

    }
    //让前端标记已读
    @PostMapping("/read/{order_id}")
    @ApiOperation("让前端标记已读 按条")
    public R<String> getMessageOrderSellerRead(@PathVariable Integer order_id) {
             if(messageOrderSellerService.updateMessageOrderSellerRead(order_id)){
                 return R.success("已读");
             }else{
                 return R.fail("id不存在");
             }


    //修改逻辑 主键为条件  而不是订单号，有些订单号可能重复 含多条信息 已弃用
//    @PostMapping("/readByorderid/{order_id}")
//    @ApiOperation("让前端标记已读 按条")
//    public R<String> getMessageOrderSellerRead(@PathVariable Integer order_id) {
//             if(messageOrderSellerService.updateMessageOrderSellerRead(order_id)){
//                 return R.success("已读");
//             }else{
//                 return R.fail("id不存在");
//             }
//    }
    //让前端标记已读   主键为条件
    @PostMapping("/read/{id}")
    @ApiOperation("标记单条消息为已读（按主键 id）")
    public R<String> markReadByPrimaryKey(@PathVariable Integer id) {
        boolean updated = messageOrderSellerService.updateReadStatusById(id);
        return updated ? R.success("已读") : R.fail("消息 id 不存在");
    }

    @Beta//重复值处理
    //让后端队友更新我的表
    @PostMapping("/update/seller")
    @ApiOperation("让后端队友更新消息表")
    @ApiOperation("更新插入消息表")
    public R<String> updateMessageOrderSeller(@RequestBody MessageOrderSeller resources) {
        //插入一条数据
        if(messageOrderSellerService.saveOrUpdate(resources))
        if(messageOrderSellerService.saveMessageOrderSellerByOrderIdAndStoreId(resources))
            return R.success("更新成功");
        return R.fail("更新失败");
//        if(messageOrderSellerService.updateById(resources)){
//            return R.success("更新成功");
//        }else{
//            return R.fail("更新失败");
//        }

    }