Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

2 天以前 c642ca1d5aad271b22155fce6bd553533343501c

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

@@ -58,6 +58,8 @@
import com.ruoyi.order.util.HuiFuTianXiaUtil;
import com.ruoyi.order.util.douyin.OrderUtil;
import com.ruoyi.order.util.douyin.VerifyUtil;
import com.ruoyi.order.util.kuaishou.KSOrderUtil;
import com.ruoyi.order.util.kuaishou.KSVerifyUtil;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.DelayTaskEnum;
import com.ruoyi.system.api.constant.SecurityConstant;
@@ -1876,13 +1878,17 @@
        // 设置返回对象的属性值
        merVerifyOrderVo.setOrderId(orderId);
        merVerifyOrderVo.setOrderFrom(6);
        merVerifyOrderVo.setOrderStatus(status.intValue() == 1 ? 2 : 3);
        merVerifyOrderVo.setOrderStatus((null == status || status.intValue() == 1) ? 2 : 3);
        List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = new ArrayList<>();
        AppUserOrderGoodsPageVo orderGoodsPageVo = new AppUserOrderGoodsPageVo();
        orderGoodsPageVo.setGoodsName(sku.getTitle());
        appUserOrderGoodsPageVoList.add(orderGoodsPageVo);
        merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
        if(null != timeCard){
        merVerifyOrderVo.setLaveTime(timeCard.getTimesCount() - timeCard.getTimesUsed());
        }else{
            merVerifyOrderVo.setLaveTime(-1);
        }
        // 返回结果
        return merVerifyOrderVo;
    }
@@ -1890,7 +1896,7 @@
    
    @Override
    public MerVerifyOrderVo verifyOrderKuaiShou(String orderId, Long shopId) {
        VerifyPrepareDataNew data = com.ruoyi.order.util.kuaishou.VerifyUtil.certificatePrepare(redisService, orderId);
        VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
        if (null == data) {
            throw new ServiceException("查询券信息失败");
        }
@@ -1916,7 +1922,11 @@
        orderGoodsPageVo.setGoodsName(sku.getTitle());
        appUserOrderGoodsPageVoList.add(orderGoodsPageVo);
        merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
        if(null != sku.getTimes_count()){
        merVerifyOrderVo.setLaveTime(sku.getTimes_count());
        }else{
            merVerifyOrderVo.setLaveTime(-1);
        }
        // 返回结果
        return merVerifyOrderVo;
    }
@@ -2183,27 +2193,43 @@
            throw new ServiceException("查询券信息失败");
        }
        List<CertificatePrepareResponseDataCertificatesItem> itemList = data.getCertificates();
        if (null == itemList || itemList.isEmpty()) {
        if (null == itemList && itemList.isEmpty()) {
            throw new ServiceException("查询券信息失败");
        }
        CertificatePrepareResponseDataCertificatesItem certificatesItem = itemList.get(0);
        //商品信息
        CertificatePrepareResponseDataCertificatesItemSku sku = certificatesItem.getSku();
        //次卡信息
        CertificatePrepareResponseDataCertificatesItemTimeCard timeCard = certificatesItem.getTimeCard();
        Number status = certificatesItem.getStatus();
        if (status.intValue() == 2) {
        if (null != status && status.intValue() == 2) {
            throw new ServiceException("该抖音券不能重复核销");
        }
        if (status.intValue() != 1) {
        if (null != status && status.intValue() != 1) {
            throw new ServiceException("抖音券核销失败");
        }
        Member member = remoteMemberService.getMemberByMobile(phone).getData();//绑定用户判断核销商户
        if(null == member){
            throw new ServiceException("手机号还未注册账户，请先进行注册");
        }
        if (member.getBindingFlag() == 1) {
            if (!member.getRelationShopId().equals(shopId)) {
                throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
            }
        }
        //不是次卡才校验是否重复核销
        if(null == timeCard){
            Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrderId()));
            if (null != one) {
                throw new ServiceException("该抖音券不能重复核销");
            }
        }
        String encryptedCode = certificatesItem.getEncryptedCode();
        List<CertificateVerifyResponseDataVerifyResultsItem> items = VerifyUtil.certificateVerify(data.getVerifyToken(), shop.getPoiId(), new ArrayList<String>() {{
        List<CertificateVerifyResponseDataVerifyResultsItem> items = VerifyUtil.certificateVerify(data.getVerifyToken(), shop.getDyPoiId(), new ArrayList<String>() {{
            add(encryptedCode);
        }});
        if (null == items || items.isEmpty()) {
            throw new ServiceException("抖音券核销失败");
        }
        Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrderId()));
        if (null != one) {
            throw new ServiceException("该抖音券不能重复核销");
        }
        
        TradeOrderQueryResponseData tradeOrderQueryResponseData = OrderUtil.queryOrderList(1, 10, data.getOrderId());
@@ -2215,16 +2241,16 @@
        BigDecimal payDiscountAmount = BigDecimal.ZERO;
        if (null != tradeOrderQueryResponseData) {
            TradeOrderQueryResponseDataOrdersItem ordersItem = tradeOrderQueryResponseData.getOrders().get(0);
            TradeOrderQueryResponseDataOrdersItemAmountInfo amountInfo = ordersItem.getAmountInfo();
            originAmount = BigDecimal.valueOf(amountInfo.getOriginAmount()).divide(new BigDecimal(100));
            payAmount = BigDecimal.valueOf(amountInfo.getPayAmount()).divide(new BigDecimal(100));
            payDiscountAmount = BigDecimal.valueOf(amountInfo.getPayDiscountAmount()).divide(new BigDecimal(100));
            originAmount = BigDecimal.valueOf(ordersItem.getOriginalAmount()).divide(new BigDecimal(100));
            payAmount = BigDecimal.valueOf(ordersItem.getPayAmount()).divide(new BigDecimal(100));
            payDiscountAmount = BigDecimal.valueOf(ordersItem.getDiscountAmount()).divide(new BigDecimal(100));
        }
        
        Date nowTime = new Date();
        Member member = remoteMemberService.getMemberByMobile(phone).getData();
        //开始添加订单数据
        Order order = new Order();
        Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrderId()));
        if(null == order){
            order = new Order();
        order.setOrderId(IdUtils.fastSimpleUUID());
        order.setDelFlag(0);
        order.setOrderStatus(3);
@@ -2242,36 +2268,31 @@
        order.setCreateTime(nowTime);
        order.setPayTime(nowTime);
        order.setTripartiteOrderId(data.getOrderId());
        
        //绑定用户判断核销商户
        if (member.getBindingFlag() == 1) {
            if (!member.getRelationShopId().equals(shopId)) {
                throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
            }
        }
        order.setUseTime(nowTime);
        order.setUseUserId(merVerifyOrderDto.getUserId());
        order.setCloseFlag(1);
        this.save(order);
        //创建服务商品
        //获取商品信息(商品简介,调理问题)
        //商品信息
        CertificatePrepareResponseDataCertificatesItemSku sku = certificatesItem.getSku();
        //次卡信息
        CertificatePrepareResponseDataCertificatesItemTimeCard timeCard = certificatesItem.getTimeCard();
        
        OrderGoods orderGoods = new OrderGoods();
        orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
        orderGoods.setDelFlag(0);
        orderGoods.setOrderId(order.getOrderId());

            ConsumerGoods consumerGoods = new ConsumerGoods();
            if(null != timeCard){
        orderGoods.setBuyNum(timeCard.getTimesCount());
        orderGoods.setCycleNumFlag(1);
        orderGoods.setServiceNum(timeCard.getTimesCount());
                consumerGoods.setServiceNum(timeCard.getTimesCount());
                consumerGoods.setUsedNum(1);
                consumerGoods.setUseTime(new Date());
            }
            orderGoods.setCycleNumFlag(1);
        orderGoods.setGoodsType(2);
        orderGoods.setGoodsName(sku.getTitle());
        orderGoodsService.save(orderGoods);
        
        ConsumerGoods consumerGoods = new ConsumerGoods();
        consumerGoods.setConsumerGoodsId(IdUtils.simpleUUID());
        consumerGoods.setDelFlag(0);
        consumerGoods.setServiceStatus(1);
@@ -2281,11 +2302,11 @@
        consumerGoods.setOrderGoodsId(orderGoods.getOrderGoodsId());
        consumerGoods.setGoodsName(sku.getTitle());
        consumerGoods.setCycleNumFlag(1);
        consumerGoods.setServiceNum(timeCard.getTimesCount());
        consumerGoods.setCreateTime(nowTime);
        consumerGoods.setGoodsType(2);
        consumerGoods.setSourceFrom(1);
        consumerGoodsService.save(consumerGoods);

        //生成返回
        MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
        merVerifyOrderVo.setOrderId(orderId);
@@ -2322,7 +2343,7 @@
                merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
            }
        }
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
            merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
        merVerifyOrderVo.setUserId(order.getUserId());
        merVerifyOrderVo.setUserName(member.getRealName());
        merVerifyOrderVo.setUserMobile(member.getMobile());
@@ -2365,6 +2386,59 @@
        memberTotalChangeDto.setConsumeTime(nowTime);
        remoteMemberService.changeMemberTotal(memberTotalChangeDto);
        return merVerifyOrderVo;
        }else{
            //扣减剩余次数
            OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
            ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
            consumerGoods.setUsedNum(consumerGoods.getUsedNum() + 1);
            consumerGoods.setUseTime(new Date());
            if(consumerGoods.getUsedNum() == consumerGoods.getServiceNum()){
                consumerGoods.setCompleteTime(new Date());
            }
            consumerGoodsService.updateById(consumerGoods);
            //生成返回
            MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
            merVerifyOrderVo.setOrderId(orderId);
            merVerifyOrderVo.setOrderNo(order.getOrderNo());
            merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
            merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
            merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
            merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
            merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
            merVerifyOrderVo.setPayMoney(order.getPayMoney());
            merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
            merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
                add(new AppUserOrderGoodsPageVo() {{
                    setOrderGoodsId(orderGoods.getOrderGoodsId());
                    setGoodsName(orderGoods.getGoodsName());
                    setGoodsType(orderGoods.getGoodsType());
                    setBuyNum(orderGoods.getBuyNum());
                }});
            }});
            merVerifyOrderVo.setCreateTime(order.getCreateTime());
            merVerifyOrderVo.setPayTime(order.getPayTime());
            merVerifyOrderVo.setUseTime(order.getUseTime());
            merVerifyOrderVo.setPayType(order.getPayType());
            merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
            //根据支付方式返回应收金额和已收金额
            if (order.getPayType() == 1) {
                merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
                merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
            } else {
                merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
                if (order.getOfflinePayMoney() != null) {
                    merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
                } else {
                    merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
                }
            }
            merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
            merVerifyOrderVo.setUserId(order.getUserId());
            merVerifyOrderVo.setUserName(member.getRealName());
            merVerifyOrderVo.setUserMobile(member.getMobile());
            merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
            return merVerifyOrderVo;
        }
    }
    
    
@@ -2382,7 +2456,7 @@
        Long shopId = merVerifyOrderDto.getShopId();
        //获取核销商户
        Shop shop = remoteShopService.getShop(shopId).getData();
        VerifyPrepareDataNew data = com.ruoyi.order.util.kuaishou.VerifyUtil.certificatePrepare(redisService, orderId);
        VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
        if (null == data) {
            throw new ServiceException("查询券信息失败");
        }
@@ -2395,20 +2469,32 @@
        if(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) > expire_time){
            throw new ServiceException("优惠券已过期");
        }
        //商品信息
        SkuTImesCard sku = certificatesItem.getSku();
        if(null == sku.getTimes_count()){
            Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrder_id()));
            if (null != one) {
                throw new ServiceException("该快手券不能重复核销");
            }
        }

        Member member = remoteMemberService.getMemberByMobile(phone).getData();
        //绑定用户判断核销商户
        if (member.getBindingFlag() == 1) {
            if (!member.getRelationShopId().equals(shopId)) {
                throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
            }
        }
        
        String encryptedCode = certificatesItem.getEncrypted_code();
        List<VerifyResult> items = com.ruoyi.order.util.kuaishou.VerifyUtil.certificateVerify(redisService, data.getVerify_token(), shop.getPoiId(), new ArrayList<String>() {{
        List<VerifyResult> items = KSVerifyUtil.certificateVerify(redisService, data.getVerify_token(), shop.getKsPoiId(), new ArrayList<String>() {{
            add(encryptedCode);
        }}, data.getOrder_id());
        if (null == items || items.isEmpty()) {
            throw new ServiceException("快手券核销失败");
        }
        Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrder_id()));
        if (null != one) {
            throw new ServiceException("该快手券不能重复核销");
        }
    
        OpenApiQueryOrderDetailInfoV1 orderDetailInfoV1 = com.ruoyi.order.util.kuaishou.OrderUtil.queryOrderInfo(redisService, data.getOrder_id());
        OpenApiQueryOrderDetailInfoV1 orderDetailInfoV1 = KSOrderUtil.queryOrderInfo(redisService, data.getOrder_id());
        //原始金额
        BigDecimal originAmount = BigDecimal.ZERO;
        //支付金额
@@ -2423,9 +2509,10 @@
        }
        
        Date nowTime = new Date();
        Member member = remoteMemberService.getMemberByMobile(phone).getData();
        Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrder_id()));
        if(null == order){
        //开始添加订单数据
        Order order = new Order();
            order = new Order();
        order.setOrderId(IdUtils.fastSimpleUUID());
        order.setDelFlag(0);
        order.setOrderStatus(3);
@@ -2443,21 +2530,12 @@
        order.setCreateTime(nowTime);
        order.setPayTime(nowTime);
        order.setTripartiteOrderId(data.getOrder_id());
        
        //绑定用户判断核销商户
        if (member.getBindingFlag() == 1) {
            if (!member.getRelationShopId().equals(shopId)) {
                throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
            }
        }
        order.setUseTime(nowTime);
        order.setUseUserId(merVerifyOrderDto.getUserId());
        order.setCloseFlag(1);
        this.save(order);
        //创建服务商品
        //获取商品信息(商品简介,调理问题)
        //商品信息
        SkuTImesCard sku = certificatesItem.getSku();
        
        OrderGoods orderGoods = new OrderGoods();
        orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
@@ -2483,6 +2561,8 @@
        consumerGoods.setGoodsName(sku.getTitle());
        consumerGoods.setCycleNumFlag(1);
        consumerGoods.setServiceNum(sku.getTimes_count());
            consumerGoods.setUsedNum(1);
            consumerGoods.setUseTime(new Date());
        consumerGoods.setCreateTime(nowTime);
        consumerGoods.setGoodsType(2);
        consumerGoods.setSourceFrom(1);
@@ -2523,7 +2603,7 @@
                merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
            }
        }
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
            merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
        merVerifyOrderVo.setUserId(order.getUserId());
        merVerifyOrderVo.setUserName(member.getRealName());
        merVerifyOrderVo.setUserMobile(member.getMobile());
@@ -2566,6 +2646,60 @@
        memberTotalChangeDto.setConsumeTime(nowTime);
        remoteMemberService.changeMemberTotal(memberTotalChangeDto);
        return merVerifyOrderVo;
        }else{
            //扣减剩余次数
            OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
            ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
            consumerGoods.setUsedNum(consumerGoods.getUsedNum() + 1);
            consumerGoods.setUseTime(new Date());
            if(consumerGoods.getUsedNum() == consumerGoods.getServiceNum()){
                consumerGoods.setCompleteTime(new Date());
            }
            consumerGoodsService.updateById(consumerGoods);
            //生成返回
            MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
            merVerifyOrderVo.setOrderId(orderId);
            merVerifyOrderVo.setOrderNo(order.getOrderNo());
            merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
            merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
            merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
            merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
            merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
            merVerifyOrderVo.setPayMoney(order.getPayMoney());
            merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
            merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
                add(new AppUserOrderGoodsPageVo() {{
                    setOrderGoodsId(orderGoods.getOrderGoodsId());
                    setGoodsName(orderGoods.getGoodsName());
                    setGoodsType(orderGoods.getGoodsType());
                    setBuyNum(orderGoods.getBuyNum());
                }});
            }});
            merVerifyOrderVo.setCreateTime(order.getCreateTime());
            merVerifyOrderVo.setPayTime(order.getPayTime());
            merVerifyOrderVo.setUseTime(order.getUseTime());
            merVerifyOrderVo.setPayType(order.getPayType());
            merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
            //根据支付方式返回应收金额和已收金额
            if (order.getPayType() == 1) {
                merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
                merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
            } else {
                merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
                if (order.getOfflinePayMoney() != null) {
                    merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
                } else {
                    merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
                }
            }
            merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
            merVerifyOrderVo.setUserId(order.getUserId());
            merVerifyOrderVo.setUserName(member.getRealName());
            merVerifyOrderVo.setUserMobile(member.getMobile());
            merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
            return merVerifyOrderVo;
        }

    }