blame | history | patch | commit | commitdiff | ignore whitespace
Administrator
6 days ago c515cd9ac4fa1e75d59689b894a979421a752f60 
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java


@@ -18,7 +18,6 @@


import cc.mrbird.febs.pay.model.BrandWCPayRequestData;


import cc.mrbird.febs.pay.service.IPayService;


import cc.mrbird.febs.pay.service.IXcxPayService;


import cc.mrbird.febs.rabbit.producter.AgentProducer;


import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.date.DateUnit;


import cn.hutool.core.date.DateUtil;


@@ -67,7 +66,6 @@


    private final MallGoodsCouponMapper mallGoodsCouponMapper;


    private final MallExpressInfoMapper mallExpressInfoMapper;




    private final AgentProducer agentProducer;


    private final IXcxPayService iXcxPayService;


    private final IPayService payService;


    private final MallMemberMapper mallMemberMapper;


@@ -257,6 +255,12 @@


                    vo.setPatternPrice(clothesPattern.getPrice());


                    vo.setPatternRemark(entity.getRemark());


                    vo.setPatternImage(clothesPattern.getImage());


                    vo.setBoxHeight(clothesPattern.getBoxHeight());


                    vo.setBoxWidth(clothesPattern.getBoxWidth());


                    vo.setLeftPercent(clothesPattern.getLeftPercent());


                    vo.setTopPercent(clothesPattern.getTopPercent());






                    vos.add(vo);




                    totalPatternPrice = totalPatternPrice.add(clothesPattern.getPrice());


@@ -281,6 +285,11 @@


                    vo.setLocationPrice(location.getPrice());


                    vo.setLocationRemark(entity.getRemark());


                    vo.setLocationImage(location.getImage());




                    vo.setBoxHeight(location.getBoxHeight());


                    vo.setBoxWidth(location.getBoxWidth());


                    vo.setLeftPercent(location.getLeftPercent());


                    vo.setTopPercent(location.getTopPercent());


                    vos.add(vo);




                    totalLocationPrice = totalLocationPrice.add(location.getPrice());


@@ -557,9 +566,6 @@


        BigDecimal realAmount = total.subtract(discountAmount).add(deliveryAmount).setScale(2, RoundingMode.DOWN);


        orderInfo.setRealAmount(realAmount);


        clothesOrderMapper.updateById(orderInfo);




        //过期时间修改成24小时


        agentProducer.sendClothesOrderCancelDelayMsg(orderInfo.getId(),  24 * 60 * 60 * 1000L);




        ApiClothesOrderInfoVo apiClothesOrderInfoVo = new ApiClothesOrderInfoVo();


        apiClothesOrderInfoVo.setOrderId(orderInfo.getId());