From 65816321c28dab1f43d0563af67dbcbad2c5bdca Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 22 五月 2023 18:15:39 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 6 +++++-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 11 +++++++----
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 5 +++--
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 15 +++++++++++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java | 3 +++
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
index de0bcf2..addcb72 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
@@ -38,6 +38,9 @@
@ApiModelProperty("关联商户")
private String shopName;
+ @ApiModelProperty("关联商户地址")
+ private String shopAddress;
+
@ApiModelProperty("生日")
private String birthday;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index d2a6216..37d8d0c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -283,14 +283,15 @@
AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
Member member = this.getByUserId(userId);
appUserInfoVo.setUserId(userId);
- appUserInfoVo.setRelationShopId(member.getRelationShopId());
appUserInfoVo.setMemberNo(member.getMemberNo());
appUserInfoVo.setNickName(member.getNickName());
appUserInfoVo.setRealName(member.getRealName());
appUserInfoVo.setPhonenumber(member.getMobile());
- if(member.getRelationShopId()!=null){
+ if(member.getRelationShopId()!=null&&member.getBindingFlag()==1){
+ appUserInfoVo.setRelationShopId(member.getRelationShopId());
Shop shop = shopService.getShop(member.getRelationShopId()).getData();
appUserInfoVo.setShopName(shop.getShopName());
+ appUserInfoVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
}
appUserInfoVo.setBirthday(member.getBirthday());
appUserInfoVo.setGender(member.getGender());
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index e3277da..e9b348e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -21,6 +21,8 @@
import java.util.List;
+import static org.reflections.Reflections.log;
+
/**
* @author jqs34
* @ClassName MerOrderController
@@ -112,11 +114,13 @@
@RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
@ApiOperation(value = "获取商户端订单列表")
public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
+ log.info("merOrderPageDto1----"+merOrderPageDto.toString());
Long userId = SecurityUtils.getUserId();
merOrderPageDto.setUserId(userId);
Page<MerOrderPageVo> page = new Page<>();
page.setSize(merOrderPageDto.getPageSize());
page.setCurrent(merOrderPageDto.getPageNum());
+ log.info("merOrderPageDto2----"+merOrderPageDto.toString());
List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
return R.ok(page.setRecords(merOrderPageVoList));
}
@@ -129,7 +133,7 @@
Page<MerMemberNoClearOrderVo> page = new Page<>();
page.setSize(merMemberNoClearOrderDto.getPageSize());
page.setCurrent(merMemberNoClearOrderDto.getPageNum());
-
+ log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
return R.ok(page.setRecords(merMemberNoClearOrderVoList));
}
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 a96e082..4708c86 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
@@ -359,6 +359,7 @@
order.setCouponMoney(couponDiscount);
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
+ order.setReceivableDeposit(orderPayDeposit);
order.setPayType(appPlaceOrderDto.getPayType());
if(order.getPayType()==1){
order.setPayMoney(orderPayMoney);
@@ -626,8 +627,12 @@
public List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberNoClearOrder(page,merMemberNoClearOrderDto.getMemberUserId());
if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ if(merMemberNoClearOrderVo.getUnPaidMoney()==null){
+ merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merMemberNoClearOrderVoList;
@@ -783,6 +788,7 @@
order.setCouponMoney(couponDiscount);
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
+ order.setReceivableDeposit(new BigDecimal("0.00"));
order.setPayType(1);
if(order.getPayType()==1){
order.setPayMoney(orderPayMoney);
@@ -852,6 +858,7 @@
Member member;
Integer orderFrom;
String orderFromDesc;
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
userId = merOrderPageVo.getUserId();
member = remoteMemberService.getMember(userId).getData();
@@ -878,6 +885,10 @@
orderFromDesc = "商城订单";
}
merOrderPageVo.setOrderFromDesc(orderFromDesc);
+ merOrderPageVo.setUnPaidMoney(merOrderPageVo.getReceivableMoney().subtract(merOrderPageVo.getPayMoney()));
+ if(merOrderPageVo.getUnPaidMoney()==null){
+ merOrderPageVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merOrderPageVoList;
@@ -893,8 +904,12 @@
public List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberOrder(page,merMemberNoClearOrderDto.getMemberUserId());
if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ if(merMemberNoClearOrderVo.getUnPaidMoney()==null){
+ merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merMemberNoClearOrderVoList;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 9f3cec6..502dffa 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -22,7 +22,7 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import org.apache.commons.lang3.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -335,11 +335,14 @@
AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
Shop shop = null;
//获取附近商户
- AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
- shop = this.getById(appNearShopVo.getShopId());
- if(member!=null&&member.getRelationShopId()!=null){
+ if(member!=null&&member.getRelationShopId()!=null&&member.getBindingFlag()==1){
//获取绑定商户
shop = this.getById(member.getRelationShopId());
+ }else if(StringUtils.isNotBlank(appNearbyShopDto.getLatitude())&&StringUtils.isNotBlank(appNearbyShopDto.getLongitude())){
+ AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
+ shop = this.getById(appNearShopVo.getShopId());
+ }else{
+ return appNearbyShopVo;
}
if(member!=null&&member.getBindingFlag()!=1){
AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
--
Gitblit v1.7.1