java/LiquorAuction.git

			@@ -7,30 +7,47 @@
			import com.google.common.collect.Lists;
			import com.ruoyi.common.core.constant.CacheConstants;
			import com.ruoyi.common.core.constant.SecurityConstants;
			import com.ruoyi.common.core.enums.*;
			import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
			import com.ruoyi.common.core.enums.AuditStatusEnum;
			import com.ruoyi.common.core.enums.BondStatusEnum;
			import com.ruoyi.common.core.enums.CouponUseEnum;
			import com.ruoyi.common.core.enums.OrderFromEnum;
			import com.ruoyi.common.core.enums.OrderStatusEnum;
			import com.ruoyi.common.core.enums.OrderTypeEnum;
			import com.ruoyi.common.core.enums.PaymentMethodEnum;
			import com.ruoyi.common.core.enums.PointStatusEnum;
			import com.ruoyi.common.core.enums.RequestTypeEnum;
			import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.utils.page.BeanUtils;
			import com.ruoyi.common.core.utils.page.CollUtils;
			import com.ruoyi.common.core.utils.page.PageDTO;
			import com.ruoyi.common.redis.service.RedisService;
			import com.ruoyi.order.controller.management.dto.MgtMallOrderQuery;
			import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
			import com.ruoyi.order.controller.management.vo.MgtMallOrderVO;
			import com.ruoyi.order.controller.management.dto.MgtOrderQuery;
			import com.ruoyi.order.controller.management.vo.MgtOrderReturnRequestVO;
			import com.ruoyi.order.controller.management.vo.MgtOrderVO;
			import com.ruoyi.order.domain.OrderReturnRequest;
			import com.ruoyi.order.domain.Paylog;
			import com.ruoyi.order.mapper.OrderAuctionBondMapper;
			import com.ruoyi.order.mapper.OrderMapper;
			import com.ruoyi.order.service.ILogisticsService;
			import com.ruoyi.order.service.IOrderReturnRequestService;
			import com.ruoyi.order.service.IOrderService;
			import com.ruoyi.order.service.IPaylogService;
			import com.ruoyi.order.util.OrderUtil;
			import com.ruoyi.order.util.SinataUtil;
			import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
			import com.ruoyi.order.vo.WdOrderVO;
			import com.ruoyi.system.api.constants.DelayTaskEnum;
			import com.ruoyi.system.api.domain.AuctionSalesroom;
			import com.ruoyi.system.api.domain.CouponMember;
			import com.ruoyi.system.api.domain.CustomConfig;
			import com.ruoyi.system.api.domain.DelayTask;
			import com.ruoyi.system.api.domain.GoodsGroupPurchase;
			import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
			import com.ruoyi.system.api.domain.GoodsSeckill;
			import com.ruoyi.system.api.domain.GoodsSku;
			import com.ruoyi.system.api.domain.Member;
			@@ -40,34 +57,42 @@
			import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
			import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
			import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
			import com.ruoyi.system.api.domain.dto.LogisticsDTO;
			import com.ruoyi.system.api.domain.dto.MemberDTO;
			import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
			import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
			import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
			import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
			import com.ruoyi.system.api.domain.dto.OrderDTO;
			import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
			import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
			import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
			import com.ruoyi.system.api.domain.vo.OrderVO;
			import com.ruoyi.system.api.domain.vo.*;
			import com.ruoyi.system.api.feignClient.AuctionClient;
			import com.ruoyi.system.api.feignClient.GoodsSkuClient;
			import com.ruoyi.system.api.feignClient.MemberClient;
			import com.ruoyi.system.api.feignClient.PromotionClient;
			import com.ruoyi.system.api.feignClient.SysUserClient;
			import io.seata.spring.annotation.GlobalTransactional;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.time.LocalDateTime;
			import java.util.Collection;
			import java.util.HashSet;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.Set;
			import java.util.concurrent.TimeUnit;
			import java.util.function.Function;
			import java.util.regex.Matcher;
			import java.util.regex.Pattern;
			import java.util.stream.Collectors;
			import javax.annotation.Resource;

			import lombok.Synchronized;
			import org.apache.commons.beanutils.BeanUtils;
			import org.apache.commons.collections.map.HashedMap;
			import org.redisson.api.RLock;
			import org.redisson.api.RedissonClient;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			/**
			* <p>
			@@ -78,6 +103,7 @@
			* @since 2024-05-16
			*/
			@Service
			@SuppressWarnings("unchecked")
			public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {

			@Resource
			@@ -110,6 +136,16 @@
			@Resource
			private RedisService redisService;

			@Resource
			private ILogisticsService logisticsService;

			@Resource
			private AuctionClient auctionClient;

			@Resource
			private GoodsSkuClient GoodsSkuClient;



			@Override
			public void saveOrderOne(OrderDTO OrderDTO) {
			@@ -117,35 +153,40 @@
			if (OrderDTO.getOrderFrom().getCode()==1){
			order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("SP"));
			order.setIsOrder(1);
			}
			if (OrderDTO.getOrderFrom().getCode()==2){
			order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("MS"));
			order.setIsOrder(1);
			}
			if (OrderDTO.getOrderFrom().getCode()==3){
			order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
			order.setIsOrder(2);
			}if (OrderDTO.getOrderFrom().getCode()==4){
			order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
			order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
			order.setIsOrder(1);
			}
			order.setOrderTime(OrderDTO.getOrderTime());
			order.setOrderFrom(OrderDTO.getOrderFrom());
			order.setAuctionType(OrderDTO.getAuctionType());
			order.setAuctionOrderType(OrderDTO.getAuctionType());
			order.setGoodsSkuId(OrderDTO.getGoodsSkuId());
			order.setMemberId(OrderDTO.getMemberId());
			order.setTotalAmount(OrderDTO.getTotalAmount());
			order.setOrderStatus(OrderStatusEnum.TO_PLAY);
			order.setPoints(OrderDTO.getPoints());
			order.setGoodsQuantity(OrderDTO.getGoodsQuantity());
			order.setGoodsQuantity(1);
			order.setReceiverName(OrderDTO.getReceiverName());
			order.setReceiverphone(OrderDTO.getReceiverphone());
			order.setReceiverPhone(OrderDTO.getReceiverphone());
			order.setReceiverCity(OrderDTO.getReceiverCity());
			order.setReceiverDetailAddress(OrderDTO.getReceiverDetailAddress());
			order.setBound(OrderDTO.getBound());
			order.setSkuName(OrderDTO.getSkuName());
			order.setPrice(OrderDTO.getPrice());
			order.setCoverPic(OrderDTO.getCoverPic());
			order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
			this.save(order);

			if (OrderDTO.getOrderFrom().getCode()==4){
			@@ -167,8 +208,11 @@
			wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,OrderDTO.getAuctionSalesroomId());
			wrapper.eq(OrderAuctionBond::getBondType,2);
			OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
			orderAuctionBond.setOrderId(order.getId());
			orderAuctionBondMapper.updateById(orderAuctionBond);
			if (orderAuctionBond!=null){
			orderAuctionBond.setOrderId(order.getId());
			orderAuctionBondMapper.updateById(orderAuctionBond);
			}

			}

			}
			@@ -195,7 +239,7 @@
			*/
			@Override
			public Integer getGroupPurchasesGoodsNum(Long id) {
			List<Order> list = this.lambdaQuery().eq(Order::getId, id)
			List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
			.in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
			OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
			return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
			@@ -218,8 +262,23 @@
			}

			@Override
			public Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
			return baseMapper.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO);
			}

			@Override
			public Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO) {
			return baseMapper.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO);
			}

			@Override
			public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
			return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
			}

			@Override
			public List<OrderVO> getOrderByGroupPurchaseMemberList1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
			return null;
			}

			@Override
			@@ -230,6 +289,7 @@
			BigDecimal pice=new BigDecimal(0);

			Order order=new Order();
			order.setMemberId(memberOrderDTO.getMemberId());
			if (memberOrderDTO.getOrderFrom()==1){
			order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("SP"));
			@@ -241,6 +301,7 @@
			if (memberOrderDTO.getOrderFrom()==3){
			order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
			order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
			order.setIsOrder(2);
			}
			if (memberOrderDTO.getPaymentMethod()==1){
			order.setPaymentMethod(PaymentMethodEnum.WECHAT);
			@@ -250,13 +311,16 @@

			if (memberOrderDTO.getOrderFrom()==1){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (goodsSku.getListingStatus().getCode()==1){
			throw new ServiceException("该商品已经下架");
			}
			if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("对不起，购买数大于库存");
			throw new ServiceException("该商品已售罄，暂无库存");
			}else{
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO.setAuctionStock(memberOrderDTO.getGoodsQuantity()*-1);
			goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
			goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-memberOrderDTO.getGoodsQuantity());
			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
			SecurityConstants.INNER);

			order.setSkuName(goodsSku.getSkuName());
			@@ -271,10 +335,14 @@
			}
			if (memberOrderDTO.getOrderFrom()==2){
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			/* String goodsLock = "goods_lock_" + CacheConstants.SECKILL_GOODS + data.getId();
			if (data.getListingStatus().getCode()==1){
			throw new ServiceException("该商品已经下架");
			}

			String goodsLock = "goods_lock_" + CacheConstants.SECKILL_GOODS + data.getId();
			RLock redissonLock = redissonClient.getLock(goodsLock);
			Integer surpNum = 0;
			try {
			/* try {
			redissonLock.lock(30, TimeUnit.SECONDS);
			surpNum = redisService.getCacheObject(CacheConstants.SECKILL_GOODS + data.getId());
			if (surpNum == null \|\| surpNum < memberOrderDTO.getGoodsQuantity()) {
			@@ -284,36 +352,88 @@
			}catch (Exception e){
			throw new ServiceException("reids 出错");
			}*/
			order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);

			MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
			memberOrderDTO1.setMemberId(order.getMemberId());
			memberOrderDTO1.setId(order.getId());
			memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
			Integer num1=0;
			if (num!=null){
			num1 =num+1;
			}else{
			num1=order.getGoodsQuantity();
			}


			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (data.getLimitNumber()!=0){
			if (data.getLimitNumber()<num1) {
			throw new ServiceException("对不起，大于商品购买数");
			}
			}


			order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(goodsSku.getPrice());
			memberOrderVO.setPrice(data.getSeckillPrice());
			memberOrderVO.setSjPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			memberOrderVO.setYouhiPrice(data.getSeckillPrice());
			pice=data.getSeckillPrice();

			if (data.getSeckillStock()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("对不起，购买数大于库存");
			if (data.getSeckillStock()<1){
			throw new ServiceException("该商品已售罄，暂无库存");
			}else{
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()-memberOrderDTO.getGoodsQuantity());
			goodsStockUpdDTO.setGoodsSkuId(data.getId());
			goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()-1);
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);

			}
			order.setSkuName(goodsSku.getSkuName());
			order.setPrice(data.getSeckillPrice());
			order.setCoverPic(goodsSku.getCoverPic());
			/redisService.setCacheObject(CacheConstants.SECKILL_GOODS + data.getId(), surpNum - memberOrderDTO.getGoodsQuantity());/
			order.setSjPrice(goodsSku.getPrice());
			redisService.setCacheObject(CacheConstants.SECKILL_GOODS + data.getId(), surpNum - memberOrderDTO.getGoodsQuantity());
			}
			if (memberOrderDTO.getOrderFrom()==3){
			order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
			GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (data.getListingStatus().getCode()==1){
			throw new ServiceException("该商品已经下架");
			}
			if (data.getStartStatus().getCode()==0){
			throw new ServiceException("该商品未开始");
			}
			GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (goodsSeckiGoodsGroupPurchaseInfo==null){
			GoodsGroupPurchase data1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			Integer num= data.getGroupSize()*data.getLimitNumber();
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data1.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (goodsSku.getStock()<num){
			throw new ServiceException("该商品库存不足无法团购");
			}

			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-num);
			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
			SecurityConstants.INNER);

			}
			/*Integer m=data.getCurrentNumber()+1;
			if (m>data.getGroupSize()){
			throw new ServiceException("对不起，大成团人数");
			}*/



			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(goodsSku.getPrice());
			memberOrderVO.setPrice(data.getGroupPurchasePrice());
			memberOrderVO.setSjPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
			@@ -322,7 +442,9 @@
			order.setSkuName(goodsSku.getSkuName());
			order.setPrice(data.getGroupPurchasePrice());
			order.setCoverPic(goodsSku.getCoverPic());
			order.setSjPrice(goodsSku.getPrice());
			}
			order.setOrderRemark(memberOrderDTO.getOrderRemark());
			order.setMemberId(memberOrderDTO.getMemberId());
			order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
			order.setOrderTime(LocalDateTime.now());
			@@ -331,26 +453,26 @@
			CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
			CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();

			BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
			Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
			BigDecimal pi=pic.multiply(new BigDecimal(aDouble));
			order.setPoints(pi.intValue());
			BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
			BigDecimal divide = pic.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
			BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
			BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
			order.setPoints(aDouble.intValue());

			order.setOrderStatus(OrderStatusEnum.TO_PLAY);

			if (memberOrderDTO.getOrderFrom()==3){
			order.setReceiverName(memberOrderDTO.getReceiverName());
			order.setReceiverCity(memberOrderDTO.getReceiverCity());
			order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
			order.setReceiverphone(memberOrderDTO.getReceiverphone());
			}else{
			MemberAddress data = memberClient.getMemberAddressOne(
			memberOrderDTO.getMemberId(), SecurityConstants.INNER).getData();
			if (StringUtils.isNotNull(data)) {
			order.setReceiverName(data.getRecipientName());
			order.setReceiverCity(data.getReceiverCity());
			order.setReceiverDetailAddress(data.getDetailedAddress());
			order.setReceiverphone(data.getRecipientPhone());
			}
			MemberAddress data = memberClient.getMemberAddressOne(
			memberOrderDTO.getMemberId(), SecurityConstants.INNER).getData();
			if (StringUtils.isNotNull(data)) {
			order.setReceiverName(data.getRecipientName());
			order.setReceiverCity(data.getReceiverCity());
			order.setReceiverDetailAddress(data.getDetailedAddress());
			order.setReceiverPhone(data.getRecipientPhone());

			memberOrderVO.setReceiverName(data.getRecipientName());
			memberOrderVO.setReceiverCity(data.getReceiverCity());
			memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
			memberOrderVO.setReceiverphone(data.getRecipientPhone());
			}

			order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			@@ -370,9 +492,16 @@
			memberOrderVO.setReceiverName(order.getReceiverName());
			memberOrderVO.setReceiverCity(order.getReceiverCity());
			memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
			memberOrderVO.setReceiverphone(order.getReceiverphone());
			memberOrderVO.setReceiverphone(order.getReceiverPhone());
			Integer delayTime = 30;
			redisService.setCacheObject(CacheConstants.ORDER_AUTOMATIC_CANCEL + "-" + order.getId(), order.getId() , delayTime.longValue(), TimeUnit.MINUTES);
			redisService.setCacheObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getId(), order.getId() , delayTime.longValue(), TimeUnit.MINUTES);

			DelayTask delayTask = new DelayTask();
			delayTask.setDelFlag(0);
			delayTask.setCreateTime(LocalDateTime.now());
			delayTask.setExecuteTime(LocalDateTime.now().plusMinutes(30));
			delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getId());
			sysUserClient.addDelayTask(delayTask, SecurityConstants.INNER);

			return memberOrderVO;
			}
			@@ -380,136 +509,234 @@
			@Override
			public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
			Order order = baseMapper.selectById(memberOrderDTO.getId());
			if(memberOrderDTO.getOrderRemark()!=null){
			order.setOrderRemark(memberOrderDTO.getOrderRemark());
			}

			MemberTiOrderVO memberOrderVO=new MemberTiOrderVO();
			if (memberOrderDTO.getReceiverDetailAddress()!=null){
			order.setReceiverName(memberOrderDTO.getReceiverName());
			order.setReceiverCity(memberOrderDTO.getReceiverCity());
			order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
			order.setReceiverphone(memberOrderDTO.getReceiverphone());
			order.setReceiverPhone(memberOrderDTO.getReceiverphone());
			baseMapper.updateById(order);
			}
			if (memberOrderDTO.getOrderRemark()!=null){
			order.setOrderRemark(memberOrderDTO.getOrderRemark());
			}if (memberOrderDTO.getGoodsQuantity()!=null){
			if (order.getOrderFrom().getCode()==1){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("对不起，购买数大于库存");
			}else{
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO.setAuctionStock(order.getGoodsQuantity()*1);
			goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
			SecurityConstants.INNER);
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("该商品库存不足");
			}

			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO1.setAuctionStock(memberOrderDTO.getGoodsQuantity()*-1);
			goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
			SecurityConstants.INNER);
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
			goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
			SecurityConstants.INNER);

			Integer m= goodsSku.getStock()+order.getGoodsQuantity();
			goodsStockUpdDTO.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
			SecurityConstants.INNER);
			order.setTotalAmount(goodsSku.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
			order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			}

			}

			if (order.getOrderFrom().getCode()==2){
			MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
			memberOrderDTO1.setMemberId(memberOrderDTO.getMemberId());
			memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderDTO1.setMemberId(order.getMemberId());
			memberOrderDTO1.setId(order.getId());
			memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
			Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
			if (data.getLimitNumber()<=num){
			throw new ServiceException("对不起，大于商品购买数");
			}else{
			if (data.getSeckillStock()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("对不起，购买数大于库存");
			Integer num1=0;
			if (num!=null){
			num1 =num+memberOrderDTO.getGoodsQuantity();
			}else{
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(data.getId());
			goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
			num1=order.getGoodsQuantity();
			}

			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(data.getId());
			goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()-memberOrderDTO.getGoodsQuantity());
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();

			order.setTotalAmount(data.getSeckillPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));

			if (data.getLimitNumber()<num1){
			throw new ServiceException("对不起，大于商品购买数");
			}else{


			if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("该商品库存不足");
			}

			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(data.getId());
			goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);

			Integer m=data.getSeckillStock()+order.getGoodsQuantity();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(data.getId());
			goodsStockUpdDTO1.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);

			order.setTotalAmount(data.getSeckillPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
			order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
			order.setSkuName(goodsSku.getSkuName());
			order.setPrice(data.getSeckillPrice());
			order.setCoverPic(goodsSku.getCoverPic());
			order.setSjPrice(goodsSku.getPrice());


			}
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			memberOrderVO.setYouhiPrice(data.getSeckillPrice());



			} if (order.getOrderFrom().getCode()==3){
			order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
			GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
			MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
			memberOrderDTO1.setMemberId(order.getMemberId());
			memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
			Integer num=baseMapper.getGoodsGroupPurchase(memberOrderDTO1);
			Integer num1=num+order.getGoodsQuantity();
			if (order.getGoodsQuantity()!=order.getGoodsQuantity()){
			if (data.getLimitNumber()<=num1){
			throw new ServiceException("对不起，大于商品购买数");
			}else{
			if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
			throw new ServiceException("对不起，大于商品购买数");
			}else{
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(data.getGroupPurchasePrice());
			memberOrderVO.setSjPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
			order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
			order.setSkuName(goodsSku.getSkuName());
			order.setPrice(data.getGroupPurchasePrice());
			order.setCoverPic(goodsSku.getCoverPic());
			order.setSjPrice(goodsSku.getPrice());
			}
			}
			}
			}
			memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
			memberOrderVO.setPrice(goodsSku.getPrice());
			memberOrderVO.setCoverPic(goodsSku.getCoverPic());
			memberOrderVO.setSkuName(goodsSku.getSkuName());
			memberOrderVO.setYouhiPrice(data.getSeckillPrice());
			}
			}

			if (memberOrderDTO.getCouponId()!=null){
			CouponMemberDTO couponMemberDTO=new CouponMemberDTO();
			couponMemberDTO.setId(memberOrderDTO.getCouponId());
			CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();


			if (order.getCouponId()!=null){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(memberOrderDTO.getCouponId());
			couponMemberDTO1.setCouponStatus(1);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}

			BigDecimal pice=new BigDecimal(0);
			if (data.getCouponType().getCode()==1){
			pice= order.getTotalAmount();
			if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
			pice.subtract(data.getReductionAmount());
			order.setDiscountMoney(data.getReductionAmount());
			if (memberOrderDTO.getGoodsQuantity()!=null){
			BigDecimal pice=order.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
			if (memberOrderDTO.getCouponId()!=null){
			CouponMemberDTO couponMemberDTO=new CouponMemberDTO();
			couponMemberDTO.setId(memberOrderDTO.getCouponId());
			CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();
			if (order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(memberOrderDTO.getCouponId());
			couponMemberDTO1.setCouponStatus(0);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}
			}
			if (data.getCouponType().getCode()==2){
			pice= order.getTotalAmount();
			pice.subtract(data.getVoucherAmount());
			order.setDiscountMoney(data.getVoucherAmount());
			}
			if (data.getCouponType().getCode()==3){
			pice= order.getTotalAmount();
			BigDecimal pice1=new BigDecimal(data.getDiscountRate());
			BigDecimal pice2=new BigDecimal(0.1);
			BigDecimal pice3=pice.multiply(pice1.multiply(pice2));
			BigDecimal pice4= pice.subtract(pice3);
			if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
			pice=pice.subtract(data.getMaxDiscount());
			order.setDiscountMoney(data.getMaxDiscount());
			}else{
			order.setDiscountMoney(pice4);
			pice=pice3;
			}

			}
			order.setCouponId(memberOrderDTO.getCouponId());
			CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
			couponMemberDTO2.setId(memberOrderDTO.getCouponId());
			couponMemberDTO2.setCouponStatus(2);
			promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
			order.setCouponId(data.getId());

			if (data.getCouponType().getCode()==1){
			if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
			pice=pice.subtract(data.getReductionAmount());
			order.setDiscountMoney(data.getReductionAmount());
			}else{
			order.setDiscountMoney(pice);
			pice=new BigDecimal(0);

			}
			}
			if (data.getCouponType().getCode()==2){
			pice= order.getTotalAmount();
			if(pice.compareTo(data.getVoucherAmount())<0){
			order.setDiscountMoney(pice);
			pice=new BigDecimal(0);
			}else{
			pice=pice.subtract(data.getVoucherAmount());
			order.setDiscountMoney(data.getVoucherAmount());
			}

			}
			if (data.getCouponType().getCode()==3){
			pice= order.getTotalAmount();
			BigDecimal pice1=new BigDecimal(data.getDiscountRate());
			BigDecimal pice2=new BigDecimal(0.1);
			BigDecimal pice3=pice.multiply(pice1.multiply(pice2));
			if (data.getMaxDiscount()!=null){
			if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
			pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
			}
			}
			if(pice.compareTo(pice3)>0){
			BigDecimal pice4= pice.subtract(pice3);
			if (data.getMaxDiscount()!=null){
			if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
			pice=pice.subtract(data.getMaxDiscount());
			order.setDiscountMoney(data.getMaxDiscount());
			}else{
			order.setDiscountMoney(pice4);
			pice=pice3;
			}
			}else{
			order.setDiscountMoney(pice.subtract(pice3));
			pice=pice3;
			}

			}else{
			order.setDiscountMoney(pice);
			pice=new BigDecimal(0);
			}



			}
			order.setCouponId(memberOrderDTO.getCouponId());
			CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
			couponMemberDTO2.setId(memberOrderDTO.getCouponId());
			couponMemberDTO2.setCouponStatus(1);
			promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
			}else{
			if (order.getCouponId()!=null&&order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setCouponStatus(0);
			couponMemberDTO1.setId(order.getCouponId());
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}
			order.setCouponId(0L);
			order.setDiscountMoney(new BigDecimal(0));
			}
			order.setTotalAmount(pice);

			CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
			CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();

			BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
			Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
			BigDecimal pi=pic.multiply(new BigDecimal(aDouble));
			order.setPoints(pi.intValue());
			if (pice.intValue()>0){
			BigDecimal divide = pice.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
			BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
			BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
			order.setPoints(aDouble.intValue());
			}else{
			order.setPoints(0);
			}


			baseMapper.updateById(order);
			}

			baseMapper.updateById(order);

			memberOrderVO.setId(order.getId());
			memberOrderVO.setOrderStatus(OrderStatusEnum.TO_PLAY);
			@@ -525,25 +752,130 @@
			memberOrderVO.setReceiverName(order.getReceiverName());
			memberOrderVO.setReceiverCity(order.getReceiverCity());
			memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
			memberOrderVO.setReceiverphone(order.getReceiverphone());
			memberOrderVO.setYouhiPrice(order.getDiscountMoney());
			memberOrderVO.setReceiverphone(order.getReceiverPhone());
			memberOrderVO.setDiscountMoney(order.getDiscountMoney());

			return memberOrderVO;
			}

			@Override
			public void updMemberOrderbz(MemberOrderDTO memberOrderDTO) {
			Order order = baseMapper.selectById(memberOrderDTO.getId());
			if(memberOrderDTO.getOrderRemark()!=null){
			order.setOrderRemark(memberOrderDTO.getOrderRemark());
			}
			baseMapper.updateById(order);

			}

			@Override
			public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {

			Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
			LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
			wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
			wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
			wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
			wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus());
			if(memberOrderListDTO.getGoodsSkuName()!=null&&memberOrderListDTO.getGoodsSkuName()!=""){
			wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
			}
			if(memberOrderListDTO.getOrderNo()!=null){
			wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
			}
			if(memberOrderListDTO.getOrderStatus()!=null){
			wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode()-1);
			}

			if(memberOrderListDTO.getIsRequest()!=null){
			wrapper.eq(Order::getIsRequest,memberOrderListDTO.getIsRequest());
			}
			wrapper.eq(Order::getIsOrder,1);
			wrapper.eq(Order::getDelFlag,0);
			wrapper.orderByDesc(Order::getCancelTime);
			wrapper.orderByDesc(Order::getCreateTime);
			Page<Order> page1 = this.page(page, wrapper);

			PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
			List<MemberOrderListVO> list = memberOrderListVOPageDTO.getList();
			for (MemberOrderListVO MemberOrderList:list){
			if (MemberOrderList.getOrderStatus().getCode()==1){
			if (MemberOrderList.getOrderFrom().getCode()==1\|\|MemberOrderList.getOrderFrom().getCode()==2\|\|MemberOrderList.getOrderFrom().getCode()==3){
			LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
			if (LocalDateTime.now().isAfter(localDateTime)) {
			// dateTime1 在 dateTime2 之后
			MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
			Order order = this.getOrder(MemberOrderList.getId());
			order.setOrderStatus(OrderStatusEnum.CANCELED);

			if (order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(order.getCouponId());
			couponMemberDTO1.setCouponStatus(0);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("SP")){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
			if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
			}

			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("MS")){
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
			}
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
			}


			this.updateById(order);
			}

			}

			}
			OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
			Wrappers.lambdaQuery(OrderReturnRequest.class)
			.eq(OrderReturnRequest::getOrderId,
			MemberOrderList.getId()).last("limit 1"));
			if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
			MemberOrderList.setStatus(orderReturnRequest.getStatus());
			MemberOrderList.setRequestId(orderReturnRequest.getId());
			MemberOrderList.setIsRequest(2);
			}else{
			MemberOrderList.setIsRequest(1);
			}
			LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
			wrapper3.eq(OrderAuctionBond::getOrderId,MemberOrderList.getId());
			OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
			if (orderAuctionBond!=null){
			if (orderAuctionBond.getBoundStatus().getCode()==1\|\|orderAuctionBond.getBoundStatus().getCode()==2){
			MemberOrderList.setIsAuctionBond(1);
			}else{
			MemberOrderList.setIsAuctionBond(2);
			}
			}else {
			MemberOrderList.setIsAuctionBond(1);
			}

			CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
			MemberOrderList.setOrderShuoMin(memberPointsPoints.getConfigValue());
			CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
			MemberOrderList.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
			}


			return memberOrderListVOPageDTO;
			}

			@@ -553,64 +885,267 @@
			OrderVO orderVO=new OrderVO();
			try {
			orderVO = BeanUtils.copyBean(order, OrderVO.class);
			orderVO.setAuctionType(order.getAuctionOrderType());
			if (orderVO.getOrderFrom().getCode()==3){
			GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			orderVO.setGroupTime(data.getGroupTime());
			orderVO.setSkuId(data.getGoodsSkuId());
			}

			OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
			Wrappers.lambdaQuery(OrderReturnRequest.class)
			.eq(OrderReturnRequest::getOrderId,
			orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
			0).last("limit 1"));
			if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
			orderVO.setStatus(orderReturnRequest.getStatus());
			orderVO.setRequestId(orderReturnRequest.getId());
			orderVO.setIsRequest(2);
			}else{
			orderVO.setIsRequest(1);
			}

			LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
			wrapper3.eq(OrderAuctionBond::getOrderId,order.getId());
			OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
			if (orderAuctionBond!=null){
			if (orderAuctionBond.getBoundStatus().getCode()==1\|\|orderAuctionBond.getBoundStatus().getCode()==2){
			orderVO.setIsAuctionBond(1);
			}else{
			orderVO.setIsAuctionBond(2);
			}
			}else {
			orderVO.setIsAuctionBond(1);
			orderVO.setBound(new BigDecimal(0));
			}

			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			if (order.getTotalAmount()==null){
			order.setTotalAmount(new BigDecimal(0));
			}
			CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
			orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
			CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
			orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
			return orderVO;
			}

			@Override
			public void CancelOrderOne(MemberOrderListDTO memberOrderListDTO) {
			Order order = baseMapper.selectById(memberOrderListDTO.getId());
			if (order.getOrderStatus().getCode()==1){
			order.setOrderStatus(OrderStatusEnum.CANCELED);
			order.setCancelTime(LocalDateTime.now());
			baseMapper.updateById(order);
			}
			if (order.getOrderStatus().getCode()==2) {
			if (order.getOrderStatus().getCode() == 1) {
			order.setOrderStatus(OrderStatusEnum.CANCELED);
			order.setCancelTime(LocalDateTime.now());
			baseMapper.updateById(order);

			updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
			if (order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(order.getCouponId());
			couponMemberDTO1.setCouponStatus(0);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("SP")){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
			if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
			}

			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("MS")){
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
			}
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
			}


			if(order.getOrderNo().contains("TG")){
			GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
			goodsGroupPurchaseInfo.setGroupPurchaseId(order.getGoodsSkuId());
			goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
			GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
			if (goodsSeckiGoodsGroupPurchaseInfo!=null){
			GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

			}
			}

			}
			if (order.getOrderStatus().getCode() == 2) {
			order.setOrderStatus(OrderStatusEnum.CANCELED);
			order.setCancelTime(LocalDateTime.now());
			baseMapper.updateById(order);

			if(order.getOrderNo().contains("SP")){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
			if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
			}
			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("MS")){
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
			}
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("TG")){
			GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
			goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
			GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
			if (goodsSeckiGoodsGroupPurchaseInfo!=null){
			GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

			}
			}

			if (order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(order.getCouponId());
			couponMemberDTO1.setCouponStatus(0);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}


			updMembeOneDTO MembeOneDTO = new updMembeOneDTO();
			MembeOneDTO.setType(2);
			MembeOneDTO.setMemberId(order.getMemberId());
			MembeOneDTO.setMoney(order.getTotalAmount());
			MembeOneDTO.setTotalPoints(order.getPoints());
			memberClient.updMembeOne(MembeOneDTO);
			memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);


			if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
			if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
			if (!bo) {
			System.out.println("支付宝退款失败");
			if (paylog != null) {
			boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
			if (!bo) {
			System.out.println("支付宝退款失败");
			}
			}
			} else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信

			} else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//微信
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			if (paylog != null) {
			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			refundFee = Integer.parseInt(money.substring(0, money.length() - 3));

			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			refundFee = 1;
			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(order.getOrderNo());
			String ma = m.replaceAll("").trim();
			boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
			if (!bo) {
			System.out.println("微信退款失败");
			}

			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(order.getOrderNo());
			String ma = m.replaceAll("").trim();
			boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
			if (!bo) {
			System.out.println("微信退款失败");
			}
			}
			}}
			}
			}

			@Override
			public void delOrderOne(MemberOrderListDTO memberOrderListDTO) {

			Order byId = this.getById(memberOrderListDTO.getId());

			if(byId.getOrderNo().contains("TG")){
			GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
			goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId());
			goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
			GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
			if (goodsSeckiGoodsGroupPurchaseInfo!=null){
			GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

			}
			}

			this.removeById(memberOrderListDTO.getId());
			if (byId.getOrderStatus().getCode() == 2) {

			updMembeOneDTO MembeOneDTO = new updMembeOneDTO();
			MembeOneDTO.setType(2);
			MembeOneDTO.setMemberId(byId.getMemberId());
			MembeOneDTO.setMoney(byId.getTotalAmount());
			MembeOneDTO.setTotalPoints(byId.getPoints());
			memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);


			if (byId.getPaymentMethod() != null && byId.getPaymentMethod().getCode() == 2) {//支付宝
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, byId.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			if (paylog != null) {
			boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
			if (!bo) {
			System.out.println("支付宝退款失败");
			}
			}

			} else if (byId.getPaymentMethod() != null && byId.getPaymentMethod().getCode() == 1) {//微信
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, byId.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			if (paylog != null) {
			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			refundFee = Integer.parseInt(money.substring(0, money.length() - 3));

			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(byId.getOrderNo());
			String ma = m.replaceAll("").trim();
			boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
			if (!bo) {
			System.out.println("微信退款失败");
			}

			}
			}
			}
			}

			@Override
			public void AffirmOrderOne(MemberOrderListDTO memberOrderListDTO) {
			@@ -623,42 +1158,204 @@
			LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
			wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
			OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
			if(orderAuctionBond!=null){
			if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
			if (!bo) {
			System.out.println("支付宝退款失败");
			}
			} else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);

			if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
			if (!bo) {
			System.out.println("支付宝退款失败");
			}
			} else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
			//获取支付信息
			LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
			Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			refundFee = 1;

			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			refundFee = 1;

			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(order.getOrderNo());
			String ma = m.replaceAll("").trim();
			boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
			if (!bo) {
			System.out.println("微信退款失败");
			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(order.getOrderNo());
			String ma = m.replaceAll("").trim();
			boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
			if (!bo) {
			System.out.println("微信退款失败");
			}
			}
			}



			}else{
			order.setOrderStatus(OrderStatusEnum.FINISHED);
			order.setReceiveTime(LocalDateTime.now());
			baseMapper.updateById(order);
			}
			}

			@Override
			public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {
			LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
			wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
			wrapper1.eq(Order::getOrderStatus,1);
			wrapper1.eq(Order::getIsOrder,1);
			wrapper1.eq(Order::getDelFlag,0);
			wrapper1.orderByDesc(Order::getCancelTime);
			List<Order> page2 = this.list(wrapper1);
			for (Order MemberOrderList:page2) {
			if (MemberOrderList.getOrderStatus().getCode() == 1) {
			if (MemberOrderList.getOrderFrom().getCode() == 1 \|\| MemberOrderList.getOrderFrom().getCode() == 2 \|\| MemberOrderList.getOrderFrom().getCode() == 3) {
			LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
			if (LocalDateTime.now().isAfter(localDateTime)) {
			// dateTime1 在 dateTime2 之后
			MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
			Order order = this.getById(MemberOrderList.getId());
			order.setOrderStatus(OrderStatusEnum.CANCELED);
			this.updateById(order);


			if (order.getCouponId()!=0){
			CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
			couponMemberDTO1.setId(order.getCouponId());
			couponMemberDTO1.setCouponStatus(0);
			promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("SP")){
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
			if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
			}

			goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			if(order.getOrderNo().contains("MS")){
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
			GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
			goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
			goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
			if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
			goodsStockUpdDTO1.setSoldQuantity(0);
			}else {
			goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
			}
			goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
			}

			}

			}
			}
			}


			MemberOrderNumVO vo=new MemberOrderNumVO();

			LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery();
			paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
			paylogEntityWrapper.eq(Order::getOrderStatus,1);
			paylogEntityWrapper.eq(Order::getDelFlag,0);
			paylogEntityWrapper.eq(Order::getIsOrder,1);
			List<Order> list = this.list(paylogEntityWrapper);
			vo.setDzforderNo(list.size());

			LambdaQueryWrapper<Order> paylogEntityWrapper1 = Wrappers.lambdaQuery();
			paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
			paylogEntityWrapper1.eq(Order::getOrderStatus,2);
			paylogEntityWrapper1.eq(Order::getDelFlag,0);
			paylogEntityWrapper1.eq(Order::getIsOrder,1);
			List<Order> list1 = this.list(paylogEntityWrapper1);
			vo.setDfhorderNo(list1.size());

			LambdaQueryWrapper<Order> paylogEntityWrapper2 = Wrappers.lambdaQuery();
			paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
			paylogEntityWrapper2.eq(Order::getOrderStatus,3);
			paylogEntityWrapper2.eq(Order::getDelFlag,0);
			paylogEntityWrapper2.eq(Order::getIsOrder,1);
			List<Order> list2 = this.list(paylogEntityWrapper2);
			vo.setDshorderNo(list2.size());



			LambdaQueryWrapper<Order> paylogEntityWrapper3 = Wrappers.lambdaQuery();
			paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
			paylogEntityWrapper3.eq(Order::getIsRequest,2);
			paylogEntityWrapper3.eq(Order::getDelFlag,0);
			paylogEntityWrapper3.eq(Order::getIsOrder,1);
			List<Order> list3 = this.list(paylogEntityWrapper3);
			vo.setShorderNo(list3.size());
			return vo;
			}

			@Override
			public PageDTO<WdOrderVO> CtjlGoodsGroupPurchase(HomeGoodsSkuDTO1 homeGoodsSkuDTO1) {
			LambdaQueryWrapper< Order> wrapper1= Wrappers.lambdaQuery();
			if (homeGoodsSkuDTO1.getSkuName()!=null&&homeGoodsSkuDTO1.getSkuName()!=""){
			wrapper1.like(Order::getSkuName,homeGoodsSkuDTO1.getSkuName());
			}
			wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
			wrapper1.eq(Order::getOrderFrom,3);
			wrapper1.eq(Order::getDelFlag,0);
			wrapper1.eq(Order::getOrderStatus,2);
			Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
			Page< Order> page1 = this.page(page, wrapper1);
			PageDTO<WdOrderVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page1, WdOrderVO.class);
			List<WdOrderVO> list2 = HomeGoodsSeckillVOPageDTO.getList();

			for (WdOrderVO goodsGroupPurchaseeVO1:list2) {

			Order byId1 = this.getById(goodsGroupPurchaseeVO1.getId());

			GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
			BeanUtils.copyProperties(data,goodsGroupPurchaseeVO1);
			GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
			goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
			goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
			goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
			goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
			goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
			if (byId1.getGroupNo()!=null){
			GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();
			if (one1!=null) {
			goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
			if (one1.getGroupStatus() == 0) {
			if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
			goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
			} else {
			goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
			}
			}
			if (one1.getGroupStatus() == 1) {
			goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
			}
			if (one1.getGroupStatus() == 2) {
			goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
			}
			}else{
			goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
			}
			}




			}


			return HomeGoodsSeckillVOPageDTO;
			}

			/**
			@@ -669,8 +1366,7 @@
			*/
			@Override
			public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
			return this.lambdaQuery().in(Order::getCouponId, couponIds)
			.eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();
			return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
			}

			/**
			@@ -680,8 +1376,8 @@
			* @return PageDTO<MgtMallOrderVO>
			*/
			@Override
			public PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query) {
			PageDTO<MgtMallOrderVO> pageVO;
			public PageDTO<MgtOrderVO> getOrderPage(MgtOrderQuery query) {
			PageDTO<MgtOrderVO> pageVO;
			// 封装会员条件查询对象
			MemberDTO memberDTO = null;
			Set<Long> memberIdSet = null;
			@@ -704,19 +1400,121 @@
			}
			page = this.lambdaQuery()
			.in(StringUtils.isNotEmpty(memberIdSet), Order::getMemberId, memberIdSet)
			.ne(StringUtils.isNotNull(query.getQueryType()) && query.getQueryType()
			.equals(OrderTypeEnum.MALL_ODER), Order::getOrderFrom,
			OrderFromEnum.AUCTION_ORDERS)
			.eq(StringUtils.isNotNull(query.getQueryType()) && query.getQueryType()
			.equals(OrderTypeEnum.AUCTION_ORDER), Order::getOrderFrom,
			OrderFromEnum.AUCTION_ORDERS)
			.like(StringUtils.isNotBlank(query.getOrderNo()), Order::getOrderNo,
			query.getOrderNo())
			.eq(StringUtils.isNotNull(query.getOrderFrom()), Order::getOrderFrom,
			.eq(StringUtils.isNotNull(query.getOrderFrom()) && query.getQueryType()
			.equals(OrderTypeEnum.MALL_ODER), Order::getOrderFrom,
			query.getOrderFrom())
			.like(StringUtils.isNotBlank(query.getSkuName()), Order::getSkuName,
			query.getSkuName())
			.eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
			query.getOrderStatus())
			.orderByDesc(Order::getCreateTime)
			.page(new Page<>(query.getPageCurr(), query.getPageSize()));
			if (StringUtils.isEmpty(page.getRecords())) {
			pageVO = PageDTO.empty(page);
			}
			pageVO = PageDTO.of(page, MgtMallOrderVO.class);
			pageVO = PageDTO.of(page, MgtOrderVO.class);
			List<MgtOrderVO> voList = pageVO.getList();
			if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
			List<MgtOrderVO> list = voList;
			// 封装参数查询拍卖会
			Set<Long> auctionSalesroomGoodsIdSet = list.stream()
			.filter(order -> order.getAuctionOrderType()
			== AuctionOrderTypeEnum.AUCTION_ITEMS)
			.map(MgtOrderVO::getGoodsSkuId).collect(Collectors.toSet());
			List<AuctionSalesroom> auctionSalesroomList = auctionClient.getAuctionSalesroomByIds(
			auctionSalesroomGoodsIdSet, SecurityConstants.INNER)
			.getData();
			Map<Long, String> salesroomMap = new HashedMap();
			Set<Long> auctionSalesroomSet = new HashSet<>();
			if (CollUtils.isNotEmpty(auctionSalesroomList)) {
			salesroomMap = auctionSalesroomList.stream()
			.collect(Collectors.toMap(AuctionSalesroom::getId,
			AuctionSalesroom::getSalesroomName));
			auctionSalesroomList.stream()
			.map(AuctionSalesroom::getId)
			.collect(Collectors.toSet());
			}
			// 封装参数查询拍卖订单保证金
			Set<Long> auctionGoodsIdSet = list.stream()
			.filter(order -> order.getAuctionOrderType()
			== AuctionOrderTypeEnum.REGULAR_ITEMS)
			.map(MgtOrderVO::getGoodsSkuId)
			.collect(Collectors.toSet());

			List<OrderAuctionBond> auctionSalesroomBondList = orderAuctionBondMapper.selectList(
			Wrappers.lambdaQuery(OrderAuctionBond.class)
			.in(CollUtils.isNotEmpty(auctionSalesroomSet),
			OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
			.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID)
			.groupBy(OrderAuctionBond::getAuctionSalesroomId,
			OrderAuctionBond::getMemberId));
			List<OrderAuctionBond> auctionGoodsBondList = orderAuctionBondMapper.selectList(
			Wrappers.lambdaQuery(OrderAuctionBond.class)
			.in(CollUtils.isNotEmpty(auctionGoodsIdSet),
			OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
			.eq(OrderAuctionBond::getBoundStatus,
			BondStatusEnum.PAID)
			.groupBy(OrderAuctionBond::getAuctionGoodsId,
			OrderAuctionBond::getMemberId));
			Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionSalesroomBondList.stream()
			.filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
			.collect(Collectors.toMap(
			bond -> bond.getAuctionSalesroomId() + "-" + bond.getMemberId(),
			Function.identity()));
			Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionGoodsBondList.stream()
			.filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
			.collect(Collectors.toMap(
			bond -> bond.getAuctionGoodsId() + "-" + bond.getMemberId(),
			Function.identity()));
			for (MgtOrderVO order : list) {
			if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
			order.setSalesroomName(
			StringUtils.isNotBlank(salesroomMap.get(order.getAuctionSalesroomId()))
			? salesroomMap.get(order.getAuctionSalesroomId()) : "无");
			order.setBoundStatus(
			StringUtils.isNotNull(auctionSalesroomBondMap.get(
			order.getAuctionSalesroomId() + "-" + order.getMemberId()))
			? auctionSalesroomBondMap.get(
			order.getAuctionSalesroomId() + "-" + order.getMemberId())
			.getBoundStatus()
			: null);
			}
			if (order.getAuctionOrderType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
			order.setSalesroomName("无");
			order.setBoundStatus(
			StringUtils.isNotNull(auctionSalesroomGoodsBondMap.get(
			order.getGoodsSkuId() + "-" + order.getMemberId()))
			? auctionSalesroomGoodsBondMap.get(
			order.getGoodsSkuId() + "-" + order.getMemberId())
			.getBoundStatus()
			: null);
			}
			}

			}
			Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
			.collect(Collectors.toSet());
			List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
			.getData();
			if (CollUtils.isNotEmpty(data)) {
			Map<Long, Member> memberMap = data.stream()
			.collect(Collectors.toMap(Member::getId, e -> e));
			voList = voList.stream().peek(order -> {
			Member member = memberMap.get(order.getMemberId());
			if (StringUtils.isNotNull(member)) {
			order.setNickname(member.getNickname());
			order.setPhone(member.getPhone());
			}
			}).collect(Collectors.toList());
			}
			return pageVO;
			}

			@@ -727,41 +1525,70 @@
			* @return MgtMallOrderVO
			*/
			@Override
			public MgtMallOrderVO getMallOrderDetail(Long id) {
			public MgtOrderVO getOrderDetail(Long id) {
			Order order = this.getById(id);
			MgtMallOrderVO mgtMallOrderVO = BeanUtils.copyBean(order, MgtMallOrderVO.class);
			MgtOrderVO mgtOrderVO = BeanUtils.copyBean(order, MgtOrderVO.class);
			// 查询用户信息
			Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
			.getData();
			if (StringUtils.isNotNull(member)) {
			mgtMallOrderVO.setNickname(member.getNickname());
			mgtMallOrderVO.setPhone(member.getPhone());
			mgtOrderVO.setNickname(member.getNickname());
			mgtOrderVO.setPhone(member.getPhone());
			}
			// 拍卖订单查询拍卖会信息
			if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS && (order.getAuctionOrderType()
			== AuctionOrderTypeEnum.AUCTION_ITEMS)) {
			List<AuctionSalesroom> auctionSalesroom = auctionClient.getAuctionSalesroomByIds(
			Lists.newArrayList(order.getGoodsSkuId())
			, SecurityConstants.INNER).getData();
			if (StringUtils.isNotNull(auctionSalesroom)) {
			mgtOrderVO.setSalesroomName(auctionSalesroom.get(0).getSalesroomName());
			}
			}
			// 查询售后信息
			if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
			if (order.getIsRequest() == 2) {
			OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
			Wrappers.lambdaQuery(OrderReturnRequest.class)
			.eq(OrderReturnRequest::getOrderId,
			order.getId()).last("limit 1"));
			if (StringUtils.isNotNull(orderReturnRequest)) {
			mgtMallOrderVO.setReturnRequestVO(BeanUtils.copyBean(orderReturnRequest,
			mgtOrderVO.setReturnRequestVO(BeanUtils.copyBean(orderReturnRequest,
			MgtOrderReturnRequestVO.class));
			}
			}
			return mgtMallOrderVO;
			// 如果订单状态为已发货、已完成、售后，查询物流信息
			if (order.getOrderStatus() == OrderStatusEnum.GOODS_TO_BE_RECEIVED
			\|\| order.getOrderStatus() == OrderStatusEnum.FINISHED
			\|\| order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
			LogisticsDTO logisticsDTO = new LogisticsDTO();
			logisticsDTO.setCompany(order.getLogisticsNum());
			logisticsDTO.setPostid(order.getCourierNumber());
			Express100VO logisticsList = logisticsService.getLogisticsList(logisticsDTO);
			if (StringUtils.isNotNull(logisticsList)) {
			mgtOrderVO.setExpress100VO(logisticsList);
			}
			}
			if (order.getOrderFrom() == OrderFromEnum.SNAP_ORDERS) {
			GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(),
			SecurityConstants.INNER).getData();
			mgtOrderVO.setSeckillPrice(data.getSeckillPrice());
			} else if (order.getOrderFrom() == OrderFromEnum.GROUP_PURCHASE_ORDERS) {
			GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(
			order.getGoodsSkuId(),
			SecurityConstants.INNER).getData();
			mgtOrderVO.setGroupPurchasesPrice(data.getGroupPurchasePrice());
			}
			return mgtOrderVO;
			}

			/**
			* 确认发货
			*
			* @param dto 确认收货请求对象
			* @param dto 确认发货请求对象
			*/
			@Override
			public void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto) {
			Order order = this.getById(dto.getId());
			if (StringUtils.isNull(order)) {
			throw new ServiceException("订单不存在");
			}
			Order order = getOrder(dto.getId());
			order.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
			order.setDeliveryTime(LocalDateTime.now());
			order.setCourierNumber(dto.getCourierNumber());
			@@ -776,14 +1603,216 @@
			*/
			@Override
			public void receivedGoods(Long id) {
			Order order = this.getById(id);
			if (StringUtils.isNull(order)) {
			throw new ServiceException("订单不存在");
			}
			Order order = getOrder(id);
			if (order.getOrderStatus() == OrderStatusEnum.GOODS_TO_BE_RECEIVED) {
			order.setOrderStatus(OrderStatusEnum.FINISHED);
			order.setReceiveTime(LocalDateTime.now());
			this.updateById(order);
			}
			}

			/**
			* 退款
			*
			* @param id 订单id
			*/
			@Override
			@GlobalTransactional(rollbackFor = Exception.class)
			@Transactional
			public void refund(Long id) {
			Order order = getOrder(id);
			if (order.getIsRequest() == 2) {
			throw new ServiceException("该订单已是售后状态");
			}
			String orderNo = order.getOrderNo();
			Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
			.last("limit 1").one();
			PaymentMethodEnum paymentMethod = order.getPaymentMethod();

			if (StringUtils.isNotNull(paylog)) {
			boolean result = handleRefund(paymentMethod, paylog, orderNo);
			if (result) {
			paylog.setState(3);// 已退款
			iPaylogService.updateById(paylog);
			}
			OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
			orderReturnRequest.setOrderId(id);
			orderReturnRequest.setRequestTime(LocalDateTime.now());
			orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
			orderReturnRequest.setRequestReason("管理后台退款");
			orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
			orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
			orderReturnRequest.setAuditTime(LocalDateTime.now());
			orderReturnRequestService.save(orderReturnRequest);
			}
			order.setIsRequest(2);
			this.updateById(order);
			// 扣除订单积分
			Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
			.getData();
			if (StringUtils.isNotNull(member)) {
			MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
			memberPointsDTO.setMemberId(order.getMemberId());
			memberPointsDTO.setPointsType(1);
			memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
			memberPointsDTO.setPoints(order.getPoints());
			memberClient.addMemberPoints(memberPointsDTO);

			updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
			updMembeOneDTO.setMemberId(order.getMemberId());
			updMembeOneDTO.setType(2);
			updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
			memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
			}
			if (Objects.nonNull(order.getCouponId())) {
			CouponMemberDTO dto = new CouponMemberDTO();
			dto.setId(order.getCouponId());
			dto.setCouponStatus(CouponUseEnum.UNUSED.getCode());
			promotionClient.updCouponMember(dto, SecurityConstants.INNER);
			}
			}

			private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
			boolean result = false;
			if (paymentMethod == PaymentMethodEnum.WECHAT) {
			String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100D);
			int refundFee = Integer.parseInt(
			refundMoney.substring(0, refundMoney.length() - 3));
			String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100D);
			Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
			String regEx = "[^0-9]";
			Pattern p = Pattern.compile(regEx);
			Matcher m = p.matcher(orderNo);
			String ma = m.replaceAll("").trim();
			result = paylogService.refundForWxpay(2, paylog.getTradeNo(),
			paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "4");
			} else if (paymentMethod == PaymentMethodEnum.ALIPAY) {
			result = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(),
			paylog.getPayMoney());

			}
			return result;
			}

			/**
			* 退款退货
			*
			* @param id 订单id
			*/
			@Override
			public void refundReturn(Long id) {
			Order order = getOrder(id);
			if (order.getIsRequest() == 2) {
			throw new ServiceException("该订单已是售后状态");
			}
			if (order.getOrderStatus() == OrderStatusEnum.FINISHED) {
			OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
			order.setIsRequest(2);
			this.updateById(order);
			MgtAfterSaleSettingDTO data = sysUserClient.getAfterSaleSetting().getData();
			if (StringUtils.isNull(data)) {
			throw new ServiceException("获取售后退货信息失败");
			}
			orderReturnRequest.setRecipientName(data.getReceiverName());
			orderReturnRequest.setRecipientPhone(data.getReceiverPhone());
			orderReturnRequest.setDetailedAddress(data.getReceiverAddress());
			orderReturnRequest.setOrderId(id);
			orderReturnRequest.setRequestTime(LocalDateTime.now());
			orderReturnRequest.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS);
			orderReturnRequest.setRequestReason("管理后台退款退货");
			orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_RETURNED);
			orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
			orderReturnRequest.setAuditTime(LocalDateTime.now());
			orderReturnRequestService.save(orderReturnRequest);
			}

			}

			private Order getOrder(Long id) {
			Order order = this.getById(id);
			if (StringUtils.isNull(order)) {
			throw new ServiceException("订单不存在");
			}
			return order;
			}

			/**
			* 拍卖订单退保证金
			*
			* @param id 订单id
			*/
			@Override
			public void refundBond(Long id) {
			Order order = getOrder(id);
			OrderAuctionBond orderAuctionBond;
			if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
			orderAuctionBond = orderAuctionBondMapper.selectOne(
			Wrappers.lambdaQuery(OrderAuctionBond.class)
			.eq(OrderAuctionBond::getOrderId, id)
			.eq(OrderAuctionBond::getAuctionSalesroomId,
			order.getAuctionSalesroomId())
			.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
			} else {
			orderAuctionBond = orderAuctionBondMapper.selectOne(
			Wrappers.lambdaQuery(OrderAuctionBond.class)
			.eq(OrderAuctionBond::getOrderId, id)
			.eq(OrderAuctionBond::getAuctionGoodsId,
			order.getGoodsSkuId())
			.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
			}
			if (StringUtils.isNotNull(orderAuctionBond)) {
			Paylog paylog = iPaylogService.lambdaQuery()
			.in(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
			.one();
			boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
			orderAuctionBond.getOrderNo());
			if (result) {
			paylog.setState(3);// 已退款
			orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
			iPaylogService.updateById(paylog);
			this.updateById(order);
			}
			}
			}

			/**
			* 查询统计订单列表
			*
			* @param startTime 开始时间
			* @param endTime 结束时间
			* @return List<Order>
			*/
			@Override
			public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {
			return baseMapper.getStaticsOrderList(startTime, endTime);
			}

			@Override
			public List<Order> getOrderListByMubres(List<String> mubres) {
			return this.lambdaQuery().in(Order::getGroupNo, mubres).list();
			}

			@Override
			public void updateOrderStatusByMubres(List<String> formedGroupMubres) {
			this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres)
			.update();
			}


			@Override
			public void updateOrderStatusByMubres1(String formedGroupMubres) {
			LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
			wrapper.eq(Order::getGroupNo, formedGroupMubres);
			List<Order> page1 = this.list(wrapper);
			for (Order p:page1){
			p.setIsOrder(1);
			this.updateById(p);
			}

			}

			@Override
			public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
			return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list();
			}
			}