|
|
@@ -7,6 +7,7 @@ import com.yc.ship.framework.common.util.collection.MapUtils;
|
|
|
import com.yc.ship.framework.common.util.object.BeanUtils;
|
|
|
import com.yc.ship.framework.ip.core.utils.AreaUtils;
|
|
|
import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
|
|
|
+import com.yc.ship.framework.security.core.LoginUser;
|
|
|
import com.yc.ship.framework.security.core.annotations.PreAuthenticated;
|
|
|
import com.yc.ship.module.otc.api.store.dto.StoreMachineDTO;
|
|
|
import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
|
|
|
@@ -98,7 +99,8 @@ public class AppOtcTradeOrderController {
|
|
|
@Operation(summary = "小程序创建订单")
|
|
|
@OperateLog(type = TRADE)
|
|
|
public CommonResult<OtcTradeOrderCreateRespVO> miniAppCreateOrder(@Valid @RequestBody MiniTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
|
|
|
- return appOtcTradeOrderService.miniAppCreateOrder(agencyAuthUtils.getAgencyLoginUser(), otcTradeOrderCreateReqVO);
|
|
|
+ LoginUser loginUser = getLoginUser();
|
|
|
+ return appOtcTradeOrderService.miniAppCreateOrder(loginUser, otcTradeOrderCreateReqVO);
|
|
|
}
|
|
|
|
|
|
@RequestDecryption
|
|
|
@@ -107,7 +109,7 @@ public class AppOtcTradeOrderController {
|
|
|
@OperateLog(type = TRADE)
|
|
|
public CommonResult<PayOrderRespVO> miniAppPayOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO) {
|
|
|
|
|
|
- return appOtcTradeOrderService.miniAppPayOrder(agencyAuthUtils.getAgencyLoginUser(), payOrderReqVO);
|
|
|
+ return appOtcTradeOrderService.miniAppPayOrder(getLoginUser(), payOrderReqVO);
|
|
|
}
|
|
|
|
|
|
@PostMapping("/miniApp/refund")
|
|
|
@@ -115,7 +117,7 @@ public class AppOtcTradeOrderController {
|
|
|
@OperateLog(type = TRADE)
|
|
|
public CommonResult<TradeRefundCreateRespVO> miniAppRefund(@Valid @RequestBody TradeRefundCreateReqVO refundCreateReqVO) {
|
|
|
refundCreateReqVO.setRefundChannel(RefundChannelEnum.MINI_APP.getType());
|
|
|
- return adminTradeOrderService.refund(agencyAuthUtils.getAgencyLoginUser(), refundCreateReqVO);
|
|
|
+ return adminTradeOrderService.refund(getLoginUser(), refundCreateReqVO);
|
|
|
}
|
|
|
|
|
|
@PostMapping("/miniApp/orderList")
|