From efaa975d89a6cc2ca16916834eba19f54f0229f8 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 16:38:04 +0800
Subject: [PATCH] 分账
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 1eb127a..915c6ea 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -39,7 +39,7 @@
*/
@Api(value = "小程序订单相关接口", tags = "小程序订单相关接口", description = "小程序订单相关接口")
@RestController
-@RequestMapping("/app/order")
+@RequestMapping("der")
public class AppOrderController extends BaseController {
@Resource
@@ -109,6 +109,7 @@
appMemberBindingDto.setBindingFlag(1);
appMemberBindingDto.setBindingType(1);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceOrderDto.setNewMemberFlag(1);
}
}
}
@@ -119,11 +120,14 @@
@RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
@ApiOperation(value = "创建活动订单")
public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
- Long userId = SecurityUtils.getUserId();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ appPlaceActivityDto.setSpbillCreateIp(loginUser.getIpaddr());
if (userId != null) {
Member member = memberService.getMember(userId).getData();
appPlaceActivityDto.setUserId(userId);
if (member != null && member.getRelationShopId() != null) {
+ appPlaceActivityDto.setOpenid(member.getMiniOpenid());
appPlaceActivityDto.setShopId(member.getRelationShopId());
}
if (member.getBindingFlag() != 1) {
@@ -134,6 +138,7 @@
appMemberBindingDto.setBindingFlag(1);
appMemberBindingDto.setBindingType(2);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceActivityDto.setNewMemberFlag(1);
}
}
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
--
Gitblit v1.7.1