修复支付等相关问题

src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java

@@ -20,6 +20,7 @@ import com.gxwebsoft.shop.param.OrderParam;
 import com.gxwebsoft.shop.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -38,6 +39,7 @@ import static com.gxwebsoft.common.core.constants.OrderConstants.*;
  * @author WebSoft
  * @since 2022-11-16 11:25:58
  */
+@Slf4j
 @Api(tags = "订单记录表管理")
 @RestController
 @RequestMapping("/api/open/order")
@@ -224,7 +226,6 @@ public class OpenOrderController extends BaseController {
       // 取消报餐截止时间
       Date date = DateUtil.date();
       int hours = date.getHours();
-      System.out.println("hours = " + hours);
       if(hours > 19){
         return fail("每天晚上8点后截止取消报餐");
       }
@@ -233,7 +234,6 @@ public class OpenOrderController extends BaseController {
         final Order orderInfo  = orderService.getById(order.getOrderId());
         // 退款
         User user = userService.getById(orderInfo.getUserId());
-        System.out.println("user = " + user);
         BigDecimal balance = user.getBalance().add(orderInfo.getPayPrice());
         user.setBalance(balance);
         userService.updateById(user);
@@ -241,9 +241,10 @@ public class OpenOrderController extends BaseController {
         UserBalanceLog userBalanceLog = new UserBalanceLog();
         userBalanceLog.setUserId(orderInfo.getUserId());
         userBalanceLog.setScene(BALANCE_REFUND);
+        userBalanceLog.setSceneId(orderInfo.getOrderId());
         userBalanceLog.setMoney(orderInfo.getPayPrice());
         userBalanceLog.setBalance(balance);
-        userBalanceLog.setComments(orderInfo.getOrderNo().toString());
+        userBalanceLog.setComments("订单号：" + orderInfo.getOrderNo());
         userBalanceLog.setMerchantCode(orderInfo.getMerchantCode());
         userBalanceLogService.save(userBalanceLog);
         return success("订单取消成功",orderInfo);
@@ -257,9 +258,9 @@ public class OpenOrderController extends BaseController {
         // 验证签名
         isCheckSign();
         try {
-            freezeOrderService.unfreeze(id);
+            freezeOrderService.unfreeze(id, BigDecimal.ZERO);
         }catch (Exception e) {
-
+            log.error(e.getMessage(), e);
         }
 //        Order order = orderService.getById(id);
         if (orderService.removeById(id)) {