白酒拍卖
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
rentaiming
2024-06-11 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc 
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java


@@ -12,27 +12,28 @@


import com.ruoyi.common.core.exception.ServiceException;


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.core.utils.page.PageDTO;


import com.ruoyi.order.domain.MemberInvoiceRise;


import com.ruoyi.order.domain.Paylog;


import com.ruoyi.order.mapper.OrderAuctionBondMapper;


import com.ruoyi.order.mapper.OrderMapper;


import com.ruoyi.order.service.IOrderAuctionBondService;


import com.ruoyi.order.service.IOrderService;


import com.ruoyi.order.service.IPaylogService;


import com.ruoyi.order.util.OrderUtil;


import com.ruoyi.system.api.domain.*;


import com.ruoyi.system.api.domain.dto.*;




import java.lang.reflect.InvocationTargetException;


import java.math.BigDecimal;


import java.time.LocalDateTime;


import java.util.List;


import java.util.Set;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import java.util.stream.Collectors;


import javax.annotation.Resource;


import com.ruoyi.order.util.SinataUtil;


import com.ruoyi.system.api.domain.CouponMember;


import com.ruoyi.system.api.domain.CustomConfig;


import com.ruoyi.system.api.domain.GoodsGroupPurchase;


import com.ruoyi.system.api.domain.GoodsSeckill;


import com.ruoyi.system.api.domain.GoodsSku;


import com.ruoyi.system.api.domain.MemberAddress;


import com.ruoyi.system.api.domain.Order;


import com.ruoyi.system.api.domain.OrderAuctionBond;


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.MemberOrderDTO;


import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;


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;


@@ -40,6 +41,13 @@


import com.ruoyi.system.api.feignClient.MemberClient;


import com.ruoyi.system.api.feignClient.PromotionClient;


import com.ruoyi.system.api.feignClient.SysUserClient;


import java.math.BigDecimal;


import java.time.LocalDateTime;


import java.util.Collection;


import java.util.List;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import javax.annotation.Resource;


import org.apache.commons.beanutils.BeanUtils;


import org.springframework.stereotype.Service;




@@ -519,6 +527,15 @@


            order.setOrderStatus(OrderStatusEnum.CANCELED);


            order.setCancelTime(LocalDateTime.now());


            baseMapper.updateById(order);




            updMembeOneDTO MembeOneDTO=new updMembeOneDTO();


            MembeOneDTO.setType(2);


            MembeOneDTO.setMemberId(order.getMemberId());


            MembeOneDTO.setMoney(order.getTotalAmount());


            MembeOneDTO.setTotalPoints(order.getPoints());


            memberClient.updMembeOne(MembeOneDTO);






            if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝


                //获取支付信息


                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();


@@ -599,4 +616,16 @@


            baseMapper.updateById(order);


        }


    }




    /**


     * 根据优惠券id集合查询订单列表


     *


     * @param couponIds 优惠券id集合


     * @return List<Order>


     */


    @Override


    public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {


        return this.lambdaQuery().in(Order::getCouponId, couponIds)


                .eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();


    }


}