Merge remote-tracking branch 'origin/devPartner' into devPartner

jiangping

2023-12-20 9d9e3e3f45406bb1a08981b159b50deb0d102e57

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -45,6 +45,7 @@
import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.*;
import com.wechat.pay.java.service.refund.model.RefundNotification;
import com.wechat.pay.java.service.refund.model.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -375,41 +376,55 @@
                .eq("member_id",memberId)
                .eq("status",Constants.goodsorderStatus.pay)
                .last(" limit 1 "));
        if(!Objects.isNull(goodsorder)&&goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
            homeResponse.setDepositStatus(Constants.goodsorderStatus.pay);
            homeResponse.setGoodsOrderId(goodsorder.getId());
            //查询当前骑行状态
            MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
                    .eq(MemberRides::getMemberId, memberId)
                    .eq(MemberRides::getOrdreId,goodsorder.getId())
                    .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                    .orderByDesc(MemberRides::getCreateDate)
                    .last(" limit 1  "));
            if (!Objects.isNull(memberRides)) {
                homeResponse.setRideStatus(memberRides.getStatus());
                MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                if(!Objects.isNull(baseParam)){
                    memberRidesResponse.setBikeType(baseParam.getName());
        homeResponse.setDepositStatus(Constants.ZERO);
        if(goodsorder!=null){
            Refund r =  this.refundMapper.selectOne(new QueryWrapper<Refund>().lambda()
                    .eq(Refund::getObjId,goodsorder.getId())
                    .eq(Refund::getIsdeleted,Constants.ZERO)
                    .eq(Refund::getStatus,Constants.ZERO)
                    .last("limit 1" ));
            if(r!=null){
                homeResponse.setDepositStatus(Constants.TWO);
            }else{
                homeResponse.setDepositStatus(Constants.ONE);
            }
            if( goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
                homeResponse.setGoodsOrderId(goodsorder.getId());
                //查询当前骑行状态
                MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
                        .eq(MemberRides::getMemberId, memberId)
                        .eq(MemberRides::getOrdreId,goodsorder.getId())
                        .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                        .orderByDesc(MemberRides::getCreateDate)
                        .last(" limit 1  "));
                if (!Objects.isNull(memberRides)) {
                    homeResponse.setRideStatus(memberRides.getStatus());
                    MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                    BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                    if(!Objects.isNull(baseParam)){
                        memberRidesResponse.setBikeType(baseParam.getName());
                    }
                    memberRidesResponse.setRideId(memberRides.getId());
                    memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                    memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                    memberRidesResponse.setRideEndTime(memberRides.getBackDate());
                    memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
                    memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                    memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                    memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                    memberRidesResponse.setBaseTime(memberRides.getBaseTime());
                    memberRidesResponse.setUnitTime(memberRides.getUnitTime());
                    memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
                    memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
                            memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                            memberRidesResponse.getUnitPrice()
                            ,memberRidesResponse.getUnitTime()));
                    homeResponse.setMemberRidesResponse(memberRidesResponse);
                }
                memberRidesResponse.setRideId(memberRides.getId());
                memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                memberRidesResponse.setRideEndTime(memberRides.getBackDate());
                memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                memberRidesResponse.setBaseTime(memberRides.getBaseTime());
                memberRidesResponse.setUnitTime(memberRides.getUnitTime());
                memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
                memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
                        memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                        memberRidesResponse.getUnitPrice()
                        ,memberRidesResponse.getUnitTime()));
                homeResponse.setMemberRidesResponse(memberRidesResponse);
            }
        }


        return homeResponse;
    }

@@ -506,18 +521,88 @@
            memberRides.get(0).setActualPrice(closeMoney);
        }
        int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//计算价格
        RefundDTO refundDTO = new RefundDTO();
        refundDTO.setOrderId(goodsorder.getId());
        refundDTO.setCanBalance(goodsorder.getMoney());
        refundDTO.setRefundAmount(new BigDecimal(refundMoney));
        refundDTO.setTotalAmount(goodsorder.getMoney());
        refundDTO.setMemberId(goodsorder.getMemberId());
        refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
        refundDTO.setCreator(goodsorder.getEditor());
        refundDTO.setType(type);
        wxMiniUtilService.wxRefund(refundDTO);
        if(refundMoney>0){
            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(goodsorder.getId());
            refundDTO.setCanBalance(goodsorder.getMoney());
            refundDTO.setRefundAmount(new BigDecimal(refundMoney));
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
            refundDTO.setCreator(goodsorder.getEditor());
            refundDTO.setType(type);
            boolean res =  wxMiniUtilService.wxRefund(refundDTO);
        }else{
            //无退款结算
            closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null);
        }
    }

    public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId) {
        log.error("========================================"+JSONObject.toJSONString(goodsorder));
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
            return;
        }
        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
        //进行订单结算业务处理
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
        //默认结算为押金金额
        if (!CollectionUtils.isEmpty(memberRides)){
            //骑行总时长
            for(MemberRides model :memberRides){
                MemberRides up = new MemberRides();
                up.setId(model.getId());
                up.setActualPrice(model.getActualPrice());
                up.setCloseDate(goodsorder.getEditDate());
                up.setCloseStatus(Constants.ONE);
                up.setEditor(goodsorder.getEditor());
                up.setEditDate(goodsorder.getEditDate());
                //更新骑行记录的计算金额和状态
                memberRidesJoinMapper.updateById(up);
            }
        }
//        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
        //退款乐行
//        int type =Constants.formatIntegerNum(refund.getType());
        Goodsorder update = new Goodsorder();
        update.setId(goodsorder.getId());
        update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
        update.setCloseMoney(closeMoney);
        update.setCloseStatus(Constants.ONE);
        update.setCloseDate(new Date());
        update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
//            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//            update.setEditor(principal.getId());
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
        }else{
            //如果是平台自动结算
            update.setCloseType(Constants.TWO);
        }
        update.setCloseId(closeId);
        //存储 消费交易流水
        Transactions transactions = new Transactions();
        transactions.setId(Constants.getUUID());
        transactions.setMemberId(goodsorder.getMemberId());
        transactions.setCreateDate(new Date());
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(goodsorder.getId());
        transactions.setMoney(closeMoney);
        transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
        transactions.setDoneDate(new Date());
        transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
        transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
        transactions.setBalance(BigDecimal.ZERO);
        transactions.setObjId(goodsorder.getId());
        transactions.setObjType(Constants.ONE);
        transactionsMapper.insert(transactions);
        //修改订单信息
        goodsorderMapper.updateById(update);
    }
    /**
     * 退款成功回调
     */
@@ -543,9 +628,12 @@
        }
        refund.setOnlineOrderid(param.getTransactionId());
        doRefundTransactions(refund);

        //退款乐行
        int type =Constants.formatIntegerNum(refund.getType());
        Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getCloseStatus()) != Constants.ZERO){
        closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId());
       /* log.error("========================================"+JSONObject.toJSONString(goodsorder));
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
            return;
        }
        //进行订单结算业务处理
@@ -565,21 +653,20 @@
                memberRidesJoinMapper.updateById(up);
            }
        }
        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
        //退款乐行
        int type =Constants.formatIntegerNum(refund.getType());

        Goodsorder update = new Goodsorder();
        update.setId(goodsorder.getId());
        update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
        update.setCloseMoney(closeMoney);
        update.setCloseStatus(Constants.ONE);
        update.setCloseDate(new Date());
        update.setCloseInfo(Constants.REFUND_TYPE.get(refund.getType()).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            update.setEditor(principal.getId());
//            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//            update.setEditor(principal.getId());
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
@@ -605,7 +692,7 @@
        transactions.setObjType(Constants.ONE);
        transactionsMapper.insert(transactions);
        //修改订单信息
        goodsorderMapper.updateById(update);
        goodsorderMapper.updateById(update);*/
    }

    private void doRefundTransactions(Refund refund ) {
@@ -1001,10 +1088,43 @@
    }


    @Override
    public void autoCancelRefunOrder(){
        Date date = new Date(System.currentTimeMillis()-5*60L*1000L);
        List<Refund> list = refundMapper.selectList(new QueryWrapper<Refund>().lambda()
                .eq(Refund::getStatus,Constants.ZERO)
                .lt(Refund::getCreateDate,date));
        if(list !=null && list.size()>0){
            List<String> cancelIds = new ArrayList<>();
            for(Refund r:list){
                com.wechat.pay.java.service.refund.model.Refund res  =wxMiniUtilService.isSuucessRefund(r.getId());
                if(res !=null){
                    //如果退款成功
                    RefundNotification param = new RefundNotification();
                    param.setRefundStatus(Status.SUCCESS);
                    param.setOutRefundNo(r.getId());
                    param.setTransactionId(res.getTransactionId());
                    //执行关闭订单业务
                    closeGoodsorderDone(param);
                }else{
                    //放入取消集合中
                    cancelIds.add(r.getId());
                }
            }
            if(cancelIds.size()>0){
                refundMapper.update(null, new UpdateWrapper<Refund>().lambda()
                        .in(Refund::getId,cancelIds)
                        .set(Refund::getStatus,Constants.ONE)
                        .set(Refund::getEditDate,new Date())
                        .set(Refund::getInfo,"超时未回调，自动取消")
                );
            }
        }
    }

    @Override
    public void autoCloseOrder( ) {
        Goodsorder goodsorder = new Goodsorder();
         Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = findList(goodsorder);