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

jiaosong

2023-10-18 051abca66db233f5dbde3f69aa706422e1ac9fd9

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

@@ -227,7 +227,15 @@
    public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
        IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
            goodsorderIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
            });
        }
        return PageData.from(goodsorderIPage);
    }


@@ -248,7 +256,7 @@
        homeResponse.setServerPhone(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.SERVER_PHONE).getCode());
        homeResponse.setLeaseNoticeUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
        homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
        homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
        homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(BigDecimal.valueOf(100)));
        homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
        homeResponse.setLeaseVideoUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
        homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
@@ -633,7 +641,7 @@
                memberRidesResponse.setUnitTime(s.getUnitTime());
                if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
                    //如果是骑行中
                    s.setDuration(rideTime> finalFreeTime ?(rideTime- finalFreeTime):0);
                    s.setDuration(rideTime> finalFreeTime ?(rideTime):0);
                }
                s.setRideTime(rideTime);
                return memberRidesResponse;
@@ -678,7 +686,7 @@
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setCode(goodsorder.getId());
        goodsorder.setMemberId(memberId);
        goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
        goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
        goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
        goodsorder.setPreOrderid(goodsorder.getId());
        goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
@@ -691,8 +699,7 @@
            request.setBody("支付押金");
            request.setAttach("createGoodsOrder");
            request.setOutTradeNo(goodsorder.getId());
//            request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
            request.setTotalFee(1);
            request.setTotalFee(goodsorder.getMoney().intValue());
            request.setSpbillCreateIp(this.getIpAddr());
            request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
            request.setOpenid(member.getOpenid());
@@ -751,8 +758,10 @@
            Date date = new Date();
            list.forEach(s->{
                try {
                    goodsorder.setEditDate(date);
                    goodsorder.setEditor(null);
                    s.setEditDate(date);
                    s.setEditor(null);
                    s.setCloseDate(date);

                    closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                }catch (BusinessException e){