From 3b1451ed5f5852b6c0bbe2bbca48874cfdb4f11e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 16:32:51 +0800
Subject: [PATCH] 店铺开启条件

---
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java |  324 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 286 insertions(+), 38 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index a0a526b..74673e8 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -10,6 +10,7 @@
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import cn.lili.base.Result;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.enums.ResultCode;
@@ -25,9 +26,15 @@
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.Goods;
+import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
 import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.goods.service.GoodsSkuService;
+import cn.lili.modules.lmk.domain.entity.CouponVirtual;
+import cn.lili.modules.lmk.domain.vo.OrderCountVO;
 import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.lmk.enums.general.VirtualGoodsTypeEnum;
+import cn.lili.modules.lmk.service.CouponVirtualService;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
 import cn.lili.modules.member.mapper.MemberMapper;
@@ -46,8 +53,11 @@
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.service.AdminUserService;
 import cn.lili.modules.permission.service.RoleService;
+import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
+import cn.lili.modules.promotion.service.CouponService;
 import cn.lili.modules.promotion.service.PintuanService;
+import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;
 import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
@@ -70,6 +80,7 @@
 import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.utils.COSUtil;
 import cn.lili.utils.CommonUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -77,6 +88,7 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Cell;
@@ -85,6 +97,7 @@
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -97,7 +110,11 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -196,7 +213,20 @@
     @Resource
     private RedisTemplate<Object,Object> redisTemplate;
 
+    @Autowired
+    private CouponService couponService;
+
+    @Autowired
+    private CouponVirtualService couponVirtualService;
+
+    @Autowired
+    private RedissonClient redissonClient;
+
+    @Autowired
+    private GoodsSkuService goodsSkuService;
     private final static  String LOCK_ORDER_NO_MQ="lock_order_no_mq:";
+    private final static  String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";
+    private final static  String LOCK_COUPON_CARD="lock_coupon_card:";
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void intoDB(TradeDTO tradeDTO) {
@@ -232,7 +262,21 @@
 //                        item.getPriceDetailDTO().setPlatFormCommissionPoint(Double.valueOf(goods.getCommission().toString()));
 //                        e.setPriceDetailDTO(item.getPriceDetailDTO());
 //                        orderItems.add(e);
-                        orderItems.add(new OrderItem(sku, item, tradeDTO));
+                        //鐗规畩澶勭悊绾夸笂绀煎搧鍗¢棶棰�
+                        String skuId = sku.getGoodsSku().getId();
+                        GoodsSku skuInfo = goodsSkuService.getById(skuId);
+                        OrderItem orderItem = new OrderItem(sku, item, tradeDTO);
+                        if (skuInfo != null) {
+                            String goodsId = skuInfo.getGoodsId();
+                            Goods goodsInfo = goodsService.getById(goodsId);
+                            if (goodsInfo != null&& VirtualGoodsTypeEnum.COUPON.name().equals(goodsInfo.getVirtualGoodsType())) {
+                                String couponId = skuInfo.getCouponId();
+                                String couponName = skuInfo.getCouponName();
+                                orderItem.setCouponId(couponId);
+                                orderItem.setCouponName(couponName);
+                            }
+                        }
+                        orderItems.add(orderItem);
                         currentOrderItems.add(new OrderItem(sku, item, tradeDTO));
                     }
             );
@@ -251,6 +295,41 @@
     }
 
     @Override
+    public OrderCountVO countByIdOrder(String id) {
+        OrderSearchParams orderSearchParams = new OrderSearchParams();
+
+        orderSearchParams.setOrderStatus(OrderStatusEnum.COMPLETED.name());
+        orderSearchParams.setMemberId(id);
+        QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
+        queryWrapper.groupBy("o.id");
+        queryWrapper.orderByDesc("o.id");
+        List<OrderSimpleVO> list =  this.baseMapper.queryByParamsCount(queryWrapper);
+        OrderCountVO orderCountVO = new OrderCountVO();
+        orderCountVO.setOrderNumCount(0);
+        orderCountVO.setOrderPriceCount(BigDecimal.ZERO);
+        if (CollectionUtil.isEmpty(list)) {
+            return orderCountVO;
+        }else {
+            for (OrderSimpleVO vo : list) {
+                if (vo == null) {
+                    System.out.println("鍑虹幇绌哄厓绱�");
+                    continue; // 璺宠繃null鍏冪礌锛屾垨鏍规嵁涓氬姟澶勭悊
+                }
+                orderCountVO.setOrderNumCount(orderCountVO.getOrderNumCount() + 1);
+
+                // 閲戦绱姞锛氱敤BigDecimal澶勭悊锛岄伩鍏嶇簿搴﹂棶棰�
+                BigDecimal flowPrice = vo.getFlowPrice() != null ?
+                        BigDecimal.valueOf(vo.getFlowPrice()) : BigDecimal.ZERO;
+
+                // 鐢˙igDecimal鐨刟dd鏂规硶绱姞
+                BigDecimal totalPrice = orderCountVO.getOrderPriceCount().add(flowPrice);
+                orderCountVO.setOrderPriceCount(totalPrice);
+
+            }
+        }
+        return orderCountVO;
+    }
+    @Override
     public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide) {
         QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
         queryWrapper.groupBy("o.id");
@@ -265,17 +344,8 @@
             }
         }
 
-//        for (OrderSimpleVO vo : page.getRecords()){
-//            Member member = memberMapperMapper.selectById(vo.getMemberId());
-//            if (member != null){
-//                vo.setNickName(member.getNickName());
-//            }
-//        }
         return page;
     }
-
-
-
     @Override
     public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams) {
         QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
@@ -424,8 +494,6 @@
                 vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
             }
         }
-
-
         XSSFWorkbook workbook = initOrderExportData(orderExportDTOS);
         try {
             // 璁剧疆鍝嶅簲澶�
@@ -460,6 +528,18 @@
         Receipt receipt = receiptService.getByOrderSn(orderSn);
         //鏌ヨ璁㈠崟鍜岃嚜璁㈠崟锛岀劧鍚庡啓鍏o杩斿洖
         return new OrderDetailVO(order, orderItems, orderLogs, receipt);
+    }
+    @Override
+    public OrderDetailVO queryEditAddressDetail(String orderSn) {
+        Order order = this.getBySn(orderSn);
+        if (order == null) {
+            throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+        }
+        //鏌ヨ璁㈠崟椤逛俊鎭�
+        List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+
+        //鏌ヨ璁㈠崟鍜岃嚜璁㈠崟锛岀劧鍚庡啓鍏o杩斿洖
+        return new OrderDetailVO(order, orderItems, null, null);
     }
 
     @Override
@@ -517,6 +597,7 @@
             throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL);
         }
     }
+
 
 
     @Override
@@ -638,16 +719,52 @@
 
         return order;
     }
+    @Override
+    @SystemLogPoint(description = "淇敼璁㈠崟", customerLog = "'璁㈠崟[' + #orderSn + ']鏀惰揣淇℃伅淇敼锛屼慨鏀逛负'+#memberAddressDTO.consigneeDetail")
+    @Transactional(rollbackFor = Exception.class)
+    public Order updateAddressConsignee(String orderSn, MemberAddressDTO memberAddressDTO) {
+        Order order = this.getBySn(orderSn);
+        if (order == null) {
+            throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+        }
+        //闄愬埗30绉掑彧鑳借姹備竴娆¢伩鍏嶅嚭鐜伴噸鏂版彁浜ら棶棰�
+        Boolean b = redisTemplate.opsForValue().setIfAbsent(LOCK_EDIT_ORDER_ADDRESS + orderSn, orderSn,30, TimeUnit.SECONDS);
+        if ( Boolean.FALSE.equals(b)){
+            throw new ServiceException("璇峰湪30绉掑悗閲嶈瘯");
+        }
+        String modifyAddressFlag = order.getModifyAddressFlag();
+        if (StringUtils.isNotBlank(modifyAddressFlag)) {
+            throw new ServiceException("褰撳墠璁㈠崟宸茬粡琚鍙�");
+        }
+        QueryWrapper<Order> wrapper = new QueryWrapper<>();
+        wrapper.eq("id", order.getId());
+        // 浣跨敤 last 鏂规硶鎷兼帴 FOR UPDATE 璇彞
+        wrapper.last("FOR UPDATE");
+        baseMapper.selectOne(wrapper);
+        //瑕佽褰曚箣鍓嶇殑鏀惰揣鍦板潃锛屾墍浠ラ渶瑕佷互浠g爜鏂瑰紡杩涜璋冪敤 涓嶉噰鐢ㄦ敞瑙�
+        String message = "璁㈠崟[" + orderSn + "]鏀惰揣淇℃伅淇敼锛岀敱[" +order.getConsigneeAddressPath()+  order.getConsigneeDetail() + "]淇敼涓篬" + memberAddressDTO.getConsigneeAddressPath()+ memberAddressDTO.getConsigneeDetail() + "]";
+        //璁板綍璁㈠崟鎿嶄綔鏃ュ織
+        BeanUtil.copyProperties(memberAddressDTO, order);
+        order.setModifyAddressFlag(ModifyAddressEnums.USED.name());
+        this.updateById(order);
+        OrderLog orderLog = new OrderLog(orderSn, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getRole().getRole(),
+                UserContext.getCurrentUser().getUsername(), message);
+        orderLogService.save(orderLog);
 
+        return order;
+    }
     @Override
     @OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鍙戣揣锛屽彂璐у崟鍙穂'+#logisticsNo+']'", orderSn = "#orderSn")
     @Transactional(rollbackFor = Exception.class)
     public Order delivery(String orderSn, String logisticsNo, String logisticsId) {
         Order order = OperationalJudgment.judgment(this.getBySn(orderSn));
         //濡傛灉璁㈠崟鏈彂璐э紝骞朵笖璁㈠崟鐘舵�佸�肩瓑浜庡緟鍙戣揣
+        log.info("鑾峰彇鍒扮殑璁㈠崟淇℃伅涓簕}", JSON.toJSONString(order));
         if (order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) && order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())) {
             //鑾峰彇瀵瑰簲鐗╂祦
             Logistics logistics = logisticsService.getById(logisticsId);
+            log.info("鑾峰彇鍒扮殑鐗╂祦淇℃伅id涓簕}", logisticsId);
+            log.info("鑾峰彇鍒扮殑鐗╂祦淇℃伅涓簕}", JSON.toJSONString(logistics));
             if (logistics == null) {
                 throw new ServiceException(ResultCode.ORDER_LOGISTICS_ERROR);
             }
@@ -709,17 +826,80 @@
     @OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鏍搁攢锛屾牳閿�鐮乕'+#verificationCode+']'", orderSn = "#orderSn")
     @Transactional(rollbackFor = Exception.class)
     public Order take(String orderSn, String verificationCode) {
+        log.info("璁㈠崟鏍搁攢璁㈠崟鍙蜂负锛歿}锛屾牳閿�鐮佷负{}",orderSn,verificationCode);
+        Order order;
+        RLock lock = redissonClient.getLock(LOCK_COUPON_CARD + orderSn);
+        try {
+             lock.lock();
+            //鑾峰彇璁㈠崟淇℃伅
+            order = this.getBySn(orderSn);
+            log.info("鑾峰彇鍒扮殑璁㈠崟淇℃伅涓簕}",JSON.toJSONString(order));
+            //璁㈠崟骞傜瓑闂
+            if (OrderStatusEnum.COMPLETED.name().equals(order.getOrderStatus())) {
+                throw new ServiceException("褰撳墠璁㈠崟宸插畬鎴愭棤娉曞啀娆℃牳楠�");
+            }
 
-        //鑾峰彇璁㈠崟淇℃伅
-        Order order = this.getBySn(orderSn);
-        //妫�娴嬭櫄鎷熻鍗曚俊鎭�
-        checkVerificationOrder(order, verificationCode);
-        order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
-        //璁㈠崟瀹屾垚
-        this.complete(orderSn);
+            //妫�娴嬭櫄鎷熻鍗曚俊鎭�
+            checkVerificationOrder(order, verificationCode);
+            order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
+            //璁㈠崟瀹屾垚
+            //鑾峰彇鎵�鏈夌殑璁㈠崟瀛愰」鐢ㄤ簬鐢熸垚浼樻儬鍗疯鍗曚俊鎭�
+            List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+            List<CouponVirtual> couponVirtuals = new  ArrayList<>();
+            for (OrderItem orderItem : orderItems) {
+                log.info("鑾峰彇鍒扮殑瀛愯鍗曚俊鎭负{}",JSON.toJSONString(orderItem));
+                String couponId = orderItem.getCouponId();
+                if (StringUtils.isBlank(couponId)) {
+                    continue;
+                }
+                String storeId = order.getStoreId();
+                Coupon one = couponService.getOne(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getStoreId, storeId).eq(Coupon::getId, couponId));
+                if (one == null) {
+                    log.error("褰撳墠璁㈠崟璁㈠崟鍙蜂负:{}涓嶅瓨鍦ㄤ腑鐨勪紭鎯犲嵎涓嶅瓨鍦�----------------------->{}",order.getId(),orderItem.getOrderSn());
+                }else {
+                    Integer num = orderItem.getNum();
+                    //褰撹喘涔版暟閲忎笉涓虹┖鐨勬椂鍊欒繘琛�
+                    if (num != null) {
+                        for (int i = 1; i <= num; i++) {
+                            CouponVirtual couponVirtual = getCouponVirtual(orderItem);
+                            couponVirtual.setCouponNo(String.format("%08d", i));
+                            couponVirtuals.add(couponVirtual);
+                        }
+                    }
+
+                }
+            }
+            if (!couponVirtuals.isEmpty()) {
+                log.info("鐢熸垚鐨勫厬鎹㈠崱涓簕}",JSON.toJSONString(couponVirtuals));
+                order.setCouponFlag(CouPonFlagEnum.COUPON.name());
+                couponVirtualService.saveBatch(couponVirtuals);
+                //鏇存柊鐘舵�佺敤浜庡悗缁皬绋嬪簭鍒ゆ柇寮瑰嚭鍗峰垪琛�
+                this.updateById(order);
+            }
+            this.complete(orderSn);
+        } finally {
+            assert lock != null;
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
         return order;
     }
 
+    private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
+        CouponVirtual couponVirtual = new CouponVirtual();
+        couponVirtual.setOrderId(orderItem.getOrderSn());
+        couponVirtual.setCouponId(orderItem.getCouponId());
+        couponVirtual.setCouponName(orderItem.getCouponName());
+        couponVirtual.setGoodsId(orderItem.getGoodsId());
+        couponVirtual.setSkuId(orderItem.getSkuId());
+        couponVirtual.setItemOrderId(orderItem.getId());
+        couponVirtual.setSkuName(orderItem.getGoodsName());
+        couponVirtual.setName(orderItem.getCouponName());
+        couponVirtual.setShareStatus(ShareStatusEnum.NOT_SHARE.name());
+        couponVirtual.setClaimStatus(ClaimStatusEnum.NOT_CLAIM.name());
+        return couponVirtual;
+    }
     @Override
     public Order take(String verificationCode) {
         String storeId = OperationalJudgment.judgment(UserContext.getCurrentUser()).getStoreId();
@@ -1093,6 +1273,65 @@
         return order;
     }
 
+    @Override
+    public Result getOrderCount(StatisticsQueryParam queryParam) {
+        LocalDateTime startTime = null;
+        LocalDateTime endTime = LocalDateTime.now(); // 缁撴潫鏃堕棿榛樿鏄綋鍓嶆椂闂�
+        int days = 0;
+
+        switch (queryParam.getSearchType()) {
+            case "TODAY":
+                // 浠婂ぉ锛氫粠浠婂ぉ0鐐瑰埌鐜板湪
+                startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+                days = 1;
+                break;
+            case "YESTERDAY":
+                // 鏄ㄥぉ锛氫粠鏄ㄥぉ0鐐瑰埌鏄ㄥぉ23:59:59
+                LocalDate yesterday = LocalDate.now().minusDays(1);
+                startTime = LocalDateTime.of(yesterday, LocalTime.MIN);
+                endTime = LocalDateTime.of(yesterday, LocalTime.MAX);
+                days = 1;
+                break;
+            case "LAST_SEVEN":
+                // 杩囧幓涓冨ぉ锛氫粠7澶╁墠0鐐瑰埌鐜板湪
+                startTime = LocalDateTime.of(LocalDate.now().minusDays(6), LocalTime.MIN);
+                days = 7;
+                break;
+            case "LAST_THIRTY":
+                // 杩囧幓30澶╋細浠�30澶╁墠0鐐瑰埌鐜板湪
+                startTime = LocalDateTime.of(LocalDate.now().minusDays(29), LocalTime.MIN);
+                days = 30;
+                break;
+            default:
+                return Result.error("涓嶆敮鎸佺殑鏃堕棿鑼冨洿绫诲瀷");
+        }
+
+// 2. 鏌ヨ璇ユ椂闂磋寖鍥村唴鐨勬瘡鏃ヨ鍗曟暟閲忥紙鎸夋棩鏈熷垎缁勶級
+//        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.between(Order::getCreateTime, startTime, endTime);
+//                // 鎸夋棩鏈熷垎缁勶紙鎻愬彇鏃ユ湡閮ㄥ垎锛�
+//
+//        // 鎵ц鏌ヨ锛岃繑鍥炴棩鏈熷拰鏁伴噺鐨勬槧灏勶紙day -> count锛�
+//        List<Map<String, Object>> maps = baseMapper.selectMaps(queryWrapper);
+//        Map<String, Long> dayCountMap = maps.stream()
+//                .collect(Collectors.toMap(
+//                        map -> map.get("day").toString(),  // 鏃ユ湡瀛楃涓诧紙濡�2023-09-19锛�
+//                        map -> Long.valueOf(map.get("count").toString())  // 璁㈠崟鏁伴噺
+//                ));
+//
+//        // 3. 鐢熸垚瀹屾暣鐨勬棩鏈熷垪琛紙纭繚鍗充娇鏌愬ぉ娌℃湁璁㈠崟涔熶細杩斿洖0锛�
+//        List<Long> orderCounts = new ArrayList<>(days);
+//        for (int i = 0; i < days; i++) {
+//            // 璁$畻褰撳墠寰幆瀵瑰簲鐨勬棩鏈燂紙浠巗tartTime寮�濮嬬殑绗琲澶╋級
+//            LocalDate currentDate = startTime.toLocalDate().plusDays(i);
+//            String dateStr = currentDate.toString(); // 杞负yyyy-MM-dd鏍煎紡
+//            // 浠庢槧灏勪腑鑾峰彇鏁伴噺锛屾病鏈夊垯涓�0
+//            orderCounts.add(dayCountMap.getOrDefault(dateStr, 0L));
+//        }
+
+        return null;
+    }
+
     /**
      * 铏氭嫙鎴愬洟
      *
@@ -1314,6 +1553,12 @@
         this.update(new LambdaUpdateWrapper<Order>()
                 .eq(Order::getSn, orderSn)
                 .set(Order::getOrderStatus, orderStatusEnum.name()));
+        //淇敼璁㈠崟鍟嗗搧 todo 鎵�鏈夌殑璁㈠崟闇�瑕佸鏍稿悗鎵嶈兘閫�娆�
+        orderItemService.update(new LambdaUpdateWrapper<OrderItem>()
+                .eq(OrderItem::getOrderSn,orderSn)
+                .set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.NOT_APPLIED.name())
+                .set(OrderItem::getCommentStatus,CommentStatusEnum.UNFINISHED.name())
+                .set(OrderItem::getComplainStatus, OrderComplaintStatusEnum.NO_APPLY.name()));
         //淇敼璁㈠崟
         OrderMessage orderMessage = new OrderMessage();
         orderMessage.setNewStatus(orderStatusEnum);
@@ -1436,7 +1681,7 @@
         // 鍒涘缓琛ㄥご
         Row header = sheet.createRow(0);
         String[] headers = {"涓昏鍗曠紪鍙�", "瀛愯鍗曠紪鍙�", "閫夎喘鍟嗗搧", "鍟嗗搧鏁伴噺", "鍟嗗搧ID", "鍟嗗搧鍗曚环", "璁㈠崟搴斾粯閲戦",
-                "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
+                "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
                 "鐪�", "甯�", "鍖�", "琛楅亾", "璇︾粏鍦板潃", "涔板鐣欒█", "璁㈠崟鎻愪氦鏃堕棿", "鏀粯瀹屾垚鏃堕棿", "鏉ユ簮",
                 "璁㈠崟鐘舵��", "璁㈠崟绫诲瀷", "鍞悗鐘舵��", "鍙栨秷鍘熷洜", "鍙戣揣鏃堕棿", "瀹屾垚鏃堕棿", "搴楅摵"};
 
@@ -1461,24 +1706,27 @@
             row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);
             row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);
             row.createCell(12).setCellValue(dto.getPaymentMethod());
-            row.createCell(13).setCellValue(dto.getConsigneeName());
-            row.createCell(14).setCellValue(dto.getConsigneeMobile());
-            row.createCell(15).setCellValue(dto.getProvince());
-            row.createCell(16).setCellValue(dto.getCity());
-            row.createCell(17).setCellValue(dto.getDistrict());
-            row.createCell(18).setCellValue(dto.getStreet());
-            row.createCell(19).setCellValue(dto.getConsigneeDetail());
-            row.createCell(20).setCellValue(dto.getRemark());
-            row.createCell(21).setCellValue(dto.getCreateTime());
-            row.createCell(22).setCellValue(dto.getPaymentTime());
-            row.createCell(23).setCellValue(dto.getClientType());
-            row.createCell(24).setCellValue(dto.getOrderStatus());
-            row.createCell(25).setCellValue(dto.getOrderType());
-            row.createCell(26).setCellValue(dto.getAfterSaleStatus());
-            row.createCell(27).setCellValue(dto.getCancelReason());
-            row.createCell(28).setCellValue(dto.getLogisticsTime());
-            row.createCell(29).setCellValue(dto.getCompleteTime());
-            row.createCell(30).setCellValue(dto.getStoreName());
+
+            row.createCell(13).setCellValue(dto.getNickName());
+
+            row.createCell(14).setCellValue(dto.getConsigneeName());
+            row.createCell(15).setCellValue(dto.getConsigneeMobile());
+            row.createCell(16).setCellValue(dto.getProvince());
+            row.createCell(17).setCellValue(dto.getCity());
+            row.createCell(18).setCellValue(dto.getDistrict());
+            row.createCell(19).setCellValue(dto.getStreet());
+            row.createCell(20).setCellValue(dto.getConsigneeDetail());
+            row.createCell(21).setCellValue(dto.getRemark());
+            row.createCell(22).setCellValue(dto.getCreateTime());
+            row.createCell(23).setCellValue(dto.getPaymentTime());
+            row.createCell(24).setCellValue(dto.getClientType());
+            row.createCell(25).setCellValue(dto.getOrderStatus());
+            row.createCell(26).setCellValue(dto.getOrderType());
+            row.createCell(27).setCellValue(dto.getAfterSaleStatus());
+            row.createCell(28).setCellValue(dto.getCancelReason());
+            row.createCell(29).setCellValue(dto.getLogisticsTime());
+            row.createCell(30).setCellValue(dto.getCompleteTime());
+            row.createCell(31).setCellValue(dto.getStoreName());
         }
 
         //淇敼鍒楀

--
Gitblit v1.8.0