111

k94314517

2023-10-18 6d87ea248cc40d2b04e7a9735afc219533e869e0

111

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -183,7 +183,7 @@

    List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);

    void goodsOrderSettlement(String orderId);
    void goodsOrderSettlement(String memberId);

    void autoCloseOrder();
}

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

@@ -258,7 +258,7 @@
        homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).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.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
        homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
        homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
        homeResponse.setIsBusiness(this.checkBusiness()?0:1);
@@ -435,23 +435,23 @@
            refundDTO.setType(type);
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
            update.setCloseId(refund.getId());
            //存储 消费交易流水
            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(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
            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);
        }
        //存储 消费交易流水
        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(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
        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);
    }
@@ -632,7 +632,11 @@
                memberRidesResponse.setRideStartTime(s.getRentDate());
                memberRidesResponse.setRideEndTime(endTime);
                memberRidesResponse.setRideTime(rideTime);
                memberRidesResponse.setDuration(s.getDuration());
                if(!s.getStatus().equals(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())){
                    memberRidesResponse.setDuration(finalFreeTime >=  rideTime?0:rideTime);
                }else{
                    memberRidesResponse.setDuration(s.getDuration());
                }
                memberRidesResponse.setBikeType(s.getParamName());
                memberRidesResponse.setBikeCode(s.getBikeCode());
                memberRidesResponse.setBasePrice(s.getBasePrice());
@@ -721,8 +725,12 @@
        LocalTime currentTime = LocalTime.now();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
        String nowTime = currentTime.format(formatter);
        if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
                ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
        try {
            if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
                    ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
                return true;
            }
        }catch (Exception e){
            return true;
        }
        return false;
@@ -773,11 +781,14 @@

    }
    @Override
    public void goodsOrderSettlement(String orderId) {
        if(StringUtils.isBlank(orderId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST );
    public void goodsOrderSettlement(String memberId) {
        Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
                .eq("member_id",memberId)
                .eq("status",Constants.goodsorderStatus.pay)
                .last(" limit 1 "));
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无骑行订单记录");
        }
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        if(goodsorder == null  ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY );
        }

 server/web/src/main/java/com/doumee/api/web/BusinessApi.java

@@ -2,6 +2,7 @@

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
@@ -169,14 +170,14 @@


    @LoginRequired
    @PreventRepeat
    @ApiOperation(value = "订单结算", notes = "小程序端")
    @GetMapping("/goodsOrderSettlement")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "orderId", value = "订单主键", required = true)
    })
    public ApiResponse goodsOrderSettlement(@RequestParam String orderId) {
        goodsorderService.goodsOrderSettlement(orderId);
    public ApiResponse goodsOrderSettlement() {
        goodsorderService.goodsOrderSettlement(getMemberId());
        return  ApiResponse.success("操作成功");
    }