diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java index 443b2743..e9929a5c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java @@ -190,13 +190,13 @@ public class OrderPlaceBusinessImpl implements OrderPlaceBusiness { log.info("[订单处理中] 加锁 {} {}", lockId, lockSecond); } } -// + public void orderHandlerUnLock(String lockId) { String lockKey = OrderCacheConstants.orderHandleLockKey(lockId); RedisUtil.delete(lockKey); log.info("[订单处理中] 解锁 {}", lockKey); } -// + // public void saveCache(OrderSavePO orderSavePO, boolean saveToDiskAsync) { // log.info("[订单缓存]保存订单缓存 {} {}", orderSavePO.getMacOrderId(), saveToDiskAsync); // RedisUtil.setString(OrderCacheConstants.orderCacheKey(orderSavePO.getMacOrderId()), JacksonUtil.writeValueAsString(orderSavePO), OrderCacheConstants.WEIGHT_CACHE_SECONDS); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java index 4a57c174..5156467e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java @@ -231,7 +231,7 @@ public class OrderInfoServiceImpl extends ServiceImpl orderInfoList = this.listOrderInfoByMacOrderId(macOrderId); // return (OrderInfo)orderInfoList.stream().max(Comparator.comparing(OrderInfo::getOrderId)).orElseThrow(() -> { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/controller/OrderInfoMobileController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/controller/OrderInfoMobileController.java index 98fc8910..e1205da7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/controller/OrderInfoMobileController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/controller/OrderInfoMobileController.java @@ -14,6 +14,7 @@ import com.bonus.core.order.mobile.vo.OrderInfoMobileVO; import com.bonus.core.order.mobile.vo.OrderListMobileVO; import com.bonus.core.order.mobile.vo.OrderShoppingCartAddResultVO; import com.bonus.core.order.mobile.vo.OrderShoppingCartListMobileVO; +import com.bonus.core.pay.api.vo.UnifyPaySelectVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -73,13 +74,13 @@ public class OrderInfoMobileController extends BaseController { OrderInfoMobileVO orderInfo = this.orderInfoMobileBusiness.orderInfo(request.getOrderId()); return R.ok(orderInfo); } -// -// @PostMapping({"/sync-pay-state"}) -// public LeResponse orderSyncPayState(@RequestBody LeRequest request) { -// JavaxValidateUtils.validate((OrderSyncPayStateMobileDTO)request.getContent()); -// return LeResponse.succ(this.orderInfoMobileBusiness.orderSyncPayState((OrderSyncPayStateMobileDTO)request.getContent())); -// } -// + + @PostMapping({"/sync-pay-state"}) + public AjaxResult orderSyncPayState(@RequestBody OrderSyncPayStateMobileDTO dto) { + JavaxValidateUtils.validate(dto); + return AjaxResult.success(this.orderInfoMobileBusiness.orderSyncPayState(dto)); + } + // @PostMapping({"/weight-info"}) // @ApiOperation("获取自助餐订单详情") // public LeResponse weightOrderInfo(@RequestBody LeRequest request) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/OrderInfoMobileBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/OrderInfoMobileBusiness.java index 983a81e7..6e1d869c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/OrderInfoMobileBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/OrderInfoMobileBusiness.java @@ -3,15 +3,17 @@ package com.bonus.core.order.mobile.service; import com.bonus.core.common.page.PageVO; import com.bonus.core.order.common.dto.RequestHeaderDTO; import com.bonus.core.order.mobile.dto.OrderListMobileDTO; +import com.bonus.core.order.mobile.dto.OrderSyncPayStateMobileDTO; import com.bonus.core.order.mobile.vo.OrderInfoMobileVO; import com.bonus.core.order.mobile.vo.OrderListMobileVO; +import com.bonus.core.pay.api.vo.UnifyPaySelectVO; import java.util.List; public interface OrderInfoMobileBusiness { // void orderPayCancel(Long orderId); // -// UnifyPaySelectVO orderSyncPayState(OrderSyncPayStateMobileDTO dto); + UnifyPaySelectVO orderSyncPayState(OrderSyncPayStateMobileDTO dto); PageVO orderList(OrderListMobileDTO orderListDTO, RequestHeaderDTO headerDTO); //