Merge remote-tracking branch 'origin/master'

xuhy

2025-11-03 6682d7c793f4a49bf13bf2f8a0170f188a701342

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java

@@ -9,8 +9,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.collect.ImmutableMap;
import com.lkl.laop.sdk.exception.SDKException;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -110,6 +112,7 @@
    @ApiOperation(value = "支付")
    @PostMapping(value = "/payOrder")
    @SneakyThrows
    @Log(title = "采购管理-支付", businessType = BusinessType.UPDATE)
    public R<?> payOrder(@RequestParam String id, String type, HttpServletRequest request) {
        try {

@@ -469,6 +472,7 @@
    @ApiOperation(value = "退款")
    @PostMapping(value = "/refundOrder")
    @SneakyThrows
    @Log(title = "采购管理-退款", businessType = BusinessType.UPDATE)
    public synchronized R<?> refundOrder(@RequestParam String id, HttpServletRequest request) {
        SysUser user = tokenService.getLoginUser().getUser();
        try {