From 43d9975c99cb947b4602f05bc2e513a20de92c38 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 06 五月 2023 20:30:42 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 126199b..d8319b0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -26,6 +26,8 @@
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
+import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
@@ -352,6 +354,7 @@
this.save(order);
appPlaceOrderVo.setOrderId(orderId);
appPlaceOrderVo.setOrderNo(orderNo);
+
//调用支付
return appPlaceOrderVo;
@@ -699,7 +702,7 @@
order.setDelFlag(0);
order.setOrderStatus(3);
order.setOrderNo(orderNo);
- order.setOrderFrom(1);
+ order.setOrderFrom(3);
order.setShopId(merNewOrderDto.getShopId());
order.setUserId(userId);
order.setOrderMoney(orderGoodsMoney);
@@ -750,5 +753,26 @@
consumerGoods.setCreateTime(new Date());
consumerGoodsService.save(consumerGoods);
}
+ Member member = remoteMemberService.getMember(userId).getData();
+ if(member.getBindingFlag()!=1){
+ //绑定商户
+ AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
+ appMemberBindingDto.setShopId(merNewOrderDto.getShopId());
+ appMemberBindingDto.setUserId(userId);
+ appMemberBindingDto.setBindingFlag(1);
+ remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ }
+ }
+
+
+ /**
+ *
+ * @param merOrderPageDto
+ * @return
+ */
+ @Override
+ public List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto){
+ List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerOrder(page, merOrderPageDto);
+ return merOrderPageVoList;
}
}
--
Gitblit v1.7.1