修改bug

mitao

2024-08-16 d7dc4db8d005a58f51d21d35147317762a16373f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -1,7 +1,5 @@
package com.ruoyi.order.service.impl;

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -96,6 +94,7 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.map.HashedMap;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
@@ -110,6 +109,7 @@
 * @author mitao
 * @since 2024-05-16
 */
@Slf4j
@Service
@SuppressWarnings("unchecked")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
@@ -296,7 +296,6 @@
    @Override
    @Synchronized
    public MemberTiOrderVO saveMemberOrder(MemberOrderDTO memberOrderDTO) {

        MemberTiOrderVO memberOrderVO=new MemberTiOrderVO();
        BigDecimal pice=new BigDecimal(0);

@@ -485,6 +484,16 @@
            memberOrderVO.setReceiverCity(data.getReceiverCity());
            memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
            memberOrderVO.setReceiverphone(data.getRecipientPhone());
        } else {
            order.setReceiverName(memberOrderDTO.getReceiverName());
            order.setReceiverCity(memberOrderDTO.getReceiverCity());
            order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
            order.setReceiverPhone(memberOrderDTO.getReceiverphone());

            memberOrderVO.setReceiverName(memberOrderDTO.getReceiverName());
            memberOrderVO.setReceiverCity(memberOrderDTO.getReceiverCity());
            memberOrderVO.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
            memberOrderVO.setReceiverphone(memberOrderDTO.getReceiverphone());
        }

        order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -518,9 +527,6 @@
        return memberOrderVO;
    }

    public static void main(String[] args) {
        System.err.println(DateUtil.format(LocalDateTime.now(), DatePattern.NORM_DATETIME_PATTERN));
    }
    @Override
    public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
        Order order = baseMapper.selectById(memberOrderDTO.getId());
@@ -1889,9 +1895,11 @@

    @Override
    public void updateOrderStatusByMubres1(String formedGroupMubres) {

        LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(Order::getGroupNo, formedGroupMubres);
        List<Order> page1 = this.list(wrapper);
        log.info("开始更新订单，已成团的团购订单：{}", page1);
        for (Order p:page1){
            p.setIsOrder(1);
            this.updateById(p);