From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 374 insertions(+), 2 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 f828a25..3c76a3a 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
@@ -12,23 +12,30 @@
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
+import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.pojo.order.OrderGoods;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.goods.GoodsFileService;
import com.ruoyi.order.service.goods.ShopGoodsService;
+import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
import com.ruoyi.order.util.CodeFactoryUtil;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteShopService;
+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;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.OrderService;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -68,6 +75,12 @@
@Resource
private RemoteShopService remoteShopService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Resource
+ private ConsumerGoodsService consumerGoodsService;
/**
* @description: buyGoods
@@ -302,7 +315,9 @@
orderGoods.setOrderId(orderId);
orderGoods.setGoodsId(goodsId);
orderGoods.setBuyNum(buyNum);
- orderGoods.setCouponId(userCouponId.toString());
+ if(userCouponId!=null){
+ orderGoods.setCouponId(userCouponId.toString());
+ }
orderGoods.setGoodsPrice(goodsPrice);
orderGoods.setGoodsTotalMoney(orderGoodsMoney);
orderGoods.setGoodsReceivableMoney(goodsRealPrice);
@@ -314,7 +329,8 @@
Order order = new Order();
order.setOrderId(orderId);
order.setDelFlag(0);
- order.setOrderStatus(1);
+ //为对接支付 直接付款成功
+ order.setOrderStatus(2);
order.setOrderNo(orderNo);
order.setOrderFrom(1);
order.setShopId(appPlaceOrderDto.getShopId());
@@ -328,10 +344,14 @@
order.setPayMoney(orderPayMoney);
order.setOnlinePayMoney(orderPayMoney);
appPlaceOrderVo.setPayMoney(orderPayMoney);
+ appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setCloseFlag(1);
}else if(order.getPayType()==2){
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
appPlaceOrderVo.setPayMoney(orderPayDeposit);
+ appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setCloseFlag(0);
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
@@ -339,6 +359,7 @@
this.save(order);
appPlaceOrderVo.setOrderId(orderId);
appPlaceOrderVo.setOrderNo(orderNo);
+
//调用支付
return appPlaceOrderVo;
@@ -375,6 +396,7 @@
}else{
appUserOrderPageVo.setSameShop(0);
}
+ appUserOrderPageVo.setVerifyCode("1-"+appUserOrderPageVo.getOrderId());
}
}
return appUserOrderPageVoList;
@@ -406,6 +428,7 @@
Shop shop = remoteShopService.getShop(order.getShopId()).getData();
appUserOrderGetVo.setShopName(shop.getShopName());
appUserOrderGetVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ appUserOrderGetVo.setVerifyCode("1-"+orderId);
return appUserOrderGetVo;
}
@@ -442,4 +465,353 @@
appOrderTotalVo.setNoUseCount(noUseCount);
return appOrderTotalVo;
}
+
+ /**
+ * 获取B端首页统计
+ * @param merHomeShopTotalVo
+ * @return
+ */
+ @Override
+ public MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo){
+ Long shopId = merHomeShopTotalVo.getShopId();
+ Integer todayShop = 0;
+ Integer unHandleOrder = 0;
+ BigDecimal shopTurnover = new BigDecimal("0.00");
+ Integer cycleSurp = 0;
+ Integer explorationSurp = 0;
+ merHomeShopTotalVo.setTodayShop(todayShop);
+ merHomeShopTotalVo.setUnHandleOrder(unHandleOrder);
+ merHomeShopTotalVo.setShopTurnover(shopTurnover);
+ merHomeShopTotalVo.setCycleSurp(cycleSurp);
+ merHomeShopTotalVo.setExplorationSurp(explorationSurp);
+ return merHomeShopTotalVo;
+ }
+
+ /**
+ * 核销订单
+ * @param orderId
+ * @return
+ */
+ @Override
+ public MerVerifyOrderVo verifyOrder(String orderId){
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ Order order = this.getById(orderId);
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listVoByOrderId(orderId);
+ merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setReceivableMoney(order.getReceivableMoney());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
+ merVerifyOrderVo.setUserName(sysUser.getNickName());
+ merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+ return merVerifyOrderVo;
+ }
+
+ /**
+ * 确认核销订单
+ * @param merVerifyOrderDto
+ * @return
+ */
+ @Override
+ public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto){
+ String orderId = merVerifyOrderDto.getOrderId();
+ BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
+ Date nowTime = new Date();
+ //更新订单信息
+ Order order = this.getById(orderId);
+ order.setOrderStatus(3);
+ order.setUseTime(nowTime);
+ order.setUseUserId(merVerifyOrderDto.getUserId());
+ order.setOfflinePayMoney(relReceiveMoney);
+ order.setPayMoney(order.getPayMoney().add(relReceiveMoney));
+ order.setCloseFlag(1);
+ this.saveOrUpdate(order);
+ //创建服务商品
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listVoByOrderId(orderId);
+ ConsumerGoods consumerGoods;
+ String consumerGoodsId;
+ for(AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList){
+ consumerGoods = new ConsumerGoods();
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderGoodsId(appUserOrderGoodsPageVo.getOrderGoodsId());
+ consumerGoods.setGoodsId(appUserOrderGoodsPageVo.getGoodsId());
+ consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
+ consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
+ consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
+ consumerGoods.setUsedNum(0);
+ consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
+ consumerGoods.setCreateTime(nowTime);
+ consumerGoodsService.save(consumerGoods);
+ }
+ //生成返回
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setReceivableMoney(order.getReceivableMoney());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
+ merVerifyOrderVo.setUserName(sysUser.getNickName());
+ merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+ return merVerifyOrderVo;
+ }
+
+ /**
+ * 收银未结清订单列表
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ @Override
+ public List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberNoClearOrder(page,merMemberNoClearOrderDto.getMemberUserId());
+ if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
+ merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ }
+ }
+ return merMemberNoClearOrderVoList;
+ }
+
+ /**
+ * 结清订单
+ * @param merCloseOrderDto
+ */
+ @Override
+ public void merCloseOrder(MerCloseOrderDto merCloseOrderDto){
+ Order order = this.getById(merCloseOrderDto.getOrderId());
+ order.setOfflinePayMoney(merCloseOrderDto.getPayMoney());
+ order.setPayMoney(order.getPayMoney().add(merCloseOrderDto.getPayMoney()));
+ order.setCloseFlag(1);
+ this.saveOrUpdate(order);
+ }
+
+ /**
+ * 创建新订单
+ * @param merNewOrderDto
+ */
+ @Override
+ public void createNewOrder(MerNewOrderDto merNewOrderDto){
+ Long userId = merNewOrderDto.getBuyUserId();
+ //创建订单
+ List<AppBuyGoodsDto> appBuyGoodsDtoList = merNewOrderDto.getAppBuyGoodsDtoList();
+ String goodsId;
+ Integer buyNum;
+ BigDecimal buyNumBig;
+ Integer serviceNum;
+ Integer goodsNum = 0;
+ Long userCouponId;
+ Goods goods;
+ BigDecimal goodsPrice;
+ BigDecimal goodsTotalPrice;
+ BigDecimal goodsRealPrice;
+ List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
+ Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
+ AppUserCouponVo appUserCouponVo;
+ Integer couponType;
+ BigDecimal moneyThreshold;
+ BigDecimal discountMoney = new BigDecimal("0.00");
+ BigDecimal discountPercent;
+ BigDecimal goodsDeposit;
+ BigDecimal orderGoodsMoney = new BigDecimal("0.00");
+ BigDecimal couponDiscount = new BigDecimal("0.00");
+ BigDecimal orderPayDeposit = new BigDecimal("0.00");
+ BigDecimal orderPayMoney = new BigDecimal("0.00");
+ String orderId = IdUtils.simpleUUID();
+ String orderNo = CodeFactoryUtil.getShopOrderNo();
+ OrderGoods orderGoods;
+ String orderGoodsId;
+ for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
+ goodsId = appBuyGoodsDto.getGoodsId();
+ userCouponId = appBuyGoodsDto.getUserCouponId();
+ goods = goodsService.getById(goodsId);
+ buyNum = appBuyGoodsDto.getBuyNum();
+ goodsPrice = goods.getSalesPrice();
+ serviceNum = goods.getServiceNum();
+ //商户定制价格
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merNewOrderDto.getShopId(),goods.getGoodsId());
+ if(shopGoods!=null){
+ goodsPrice = shopGoods.getSalesPrice();
+ serviceNum = shopGoods.getServiceNum();
+ }
+ buyNumBig = BigDecimal.valueOf(buyNum);
+ goodsTotalPrice = goodsPrice.multiply(buyNumBig);
+ goodsRealPrice = goodsTotalPrice;
+ if(userCouponId!=null){
+ appUserCouponVo = appUserCouponVoMap.get(userCouponId);
+ if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
+ couponType = appUserCouponVo.getCouponType();
+ if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
+ moneyThreshold = appUserCouponVo.getMoneyThreshold();
+ if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
+ discountMoney = appUserCouponVo.getDiscountMoney();
+ goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+ }
+ }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
+ discountPercent = appUserCouponVo.getDiscountPercent();
+ goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
+ discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
+ }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
+ discountMoney = appUserCouponVo.getDiscountMoney();
+ goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+ }
+ }
+ }
+
+ goodsDeposit = goods.getSubscription();
+ if(goodsDeposit == null){
+ goodsDeposit = new BigDecimal("0.00");
+ }
+ goodsNum = goodsNum + buyNum;
+ orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
+ couponDiscount = couponDiscount.add(discountMoney);
+ orderPayDeposit = orderPayDeposit.add(goodsDeposit);
+ orderPayMoney = orderPayMoney.add(goodsRealPrice);
+ //创建OrderGoods
+ orderGoods = new OrderGoods();
+ orderGoodsId = IdUtils.simpleUUID();
+ orderGoods.setOrderGoodsId(orderGoodsId);
+ orderGoods.setDelFlag(0);
+ orderGoods.setOrderId(orderId);
+ orderGoods.setGoodsId(goodsId);
+ orderGoods.setBuyNum(buyNum);
+ orderGoods.setCouponId(userCouponId.toString());
+ orderGoods.setGoodsPrice(goodsPrice);
+ orderGoods.setGoodsTotalMoney(orderGoodsMoney);
+ orderGoods.setGoodsReceivableMoney(goodsRealPrice);
+ orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
+ orderGoods.setServiceNum(serviceNum);
+ orderGoods.setGoodsType(goods.getGoodsType());
+ orderGoodsService.save(orderGoods);
+ }
+ Order order = new Order();
+ order.setOrderId(orderId);
+ order.setDelFlag(0);
+ order.setOrderStatus(3);
+ order.setOrderNo(orderNo);
+ order.setOrderFrom(3);
+ order.setShopId(merNewOrderDto.getShopId());
+ order.setUserId(userId);
+ order.setOrderMoney(orderGoodsMoney);
+ order.setCouponMoney(couponDiscount);
+ order.setDiscountMoney(couponDiscount);
+ order.setReceivableMoney(orderPayMoney);
+ order.setPayType(1);
+ if(order.getPayType()==1){
+ order.setPayMoney(orderPayMoney);
+ order.setOnlinePayMoney(orderPayMoney);
+ order.setCloseFlag(1);
+ }else if(order.getPayType()==2){
+ order.setPayMoney(orderPayDeposit);
+ order.setOnlinePayMoney(orderPayDeposit);
+ order.setCloseFlag(0);
+ }
+ order.setOrderRemark(merNewOrderDto.getOrderRemark());
+ order.setGoodsNum(goodsNum);
+ order.setCreateTime(new Date());
+ order.setPayTime(new Date());
+ order.setUseTime(new Date());
+ order.setUseUserId(merNewOrderDto.getUserId());
+ order.setPayMoney(merNewOrderDto.getPayMoney());
+ order.setOnlinePayMoney(new BigDecimal("0.00"));
+ order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
+ order.setCloseFlag(1);
+ this.save(order);
+ //创建服务
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listVoByOrderId(orderId);
+ ConsumerGoods consumerGoods;
+ String consumerGoodsId;
+ for(AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList){
+ consumerGoods = new ConsumerGoods();
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderGoodsId(appUserOrderGoodsPageVo.getOrderGoodsId());
+ consumerGoods.setGoodsId(appUserOrderGoodsPageVo.getGoodsId());
+ consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
+ consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
+ consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
+ consumerGoods.setUsedNum(0);
+ consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
+ 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);
+ if(merOrderPageVoList!=null&&!merOrderPageVoList.isEmpty()){
+ Long userId;
+ Member member;
+ Integer orderFrom;
+ String orderFromDesc;
+ for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
+ userId = merOrderPageVo.getUserId();
+ member = remoteMemberService.getMember(userId).getData();
+ merOrderPageVo.setUserName(member.getRealName());
+ merOrderPageVo.setUserMobile(member.getMobile());
+ orderFrom = merOrderPageVo.getOrderFrom();
+ orderFromDesc = "商城订单";
+ merOrderPageVo.setOrderFromDesc(orderFromDesc);
+ }
+ }
+ return merOrderPageVoList;
+ }
+
+ /**
+ *
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ @Override
+ public List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberOrder(page,merMemberNoClearOrderDto.getMemberUserId());
+ if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
+ merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ }
+ }
+ return merMemberNoClearOrderVoList;
+ }
}
--
Gitblit v1.7.1