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

rk

9 分钟以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

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

@@ -391,6 +391,7 @@
        homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_NOTICE).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.setDouyinExchangeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.DOUYIN_EXCHANGE_TIPS).getCode());
        homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
        homeResponse.setIsBusiness(this.checkBusiness()?0:1);
        homeResponse.setUnBusinessTips("营业时间为"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"，请在营业时间内使用本系统");
@@ -481,6 +482,13 @@
                }
            }
        }
        // 当前会员有效套餐(status=0 正常 + isdeleted=0),按获得时间(createDate)倒序,最多10条
        homeResponse.setValidDiscountList(discountMemberMapper.selectList(new QueryWrapper<DiscountMember>().lambda()
                .eq(DiscountMember::getMemberId, memberId)
                .eq(DiscountMember::getStatus, Constants.ZERO)
                .eq(DiscountMember::getIsdeleted, Constants.ZERO)
                .orderByDesc(DiscountMember::getCreateDate)
                .last(" limit 10 ")));
        return homeResponse;
    }

@@ -811,7 +819,8 @@
        if(type == 0|| type ==1 || type==2){
            //如果是阶段退款
            Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
            closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),null);
            List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());//打车骑行记录
            closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),memberRides);
        }
     }

@@ -975,7 +984,16 @@

    @Override
    public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO) {
        // platform 端:登录人从 Shiro 上下文取,委托给带 creator 的重载方法
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if (Objects.isNull(principal) || StringUtils.isBlank(principal.getId())) {
            throw new BusinessException(ResponseStatus.BE_OVERDUE);
        }
        backGoodsorder(goodsorderBackDTO, principal.getId());
    }

    @Override
    public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO, String creator) {
        if(Objects.isNull(goodsorderBackDTO)
        || StringUtils.isBlank(goodsorderBackDTO.getOrderId())
                || Objects.isNull(goodsorderBackDTO.getBackType())
@@ -1011,7 +1029,7 @@
            refundDTO.setRefundAmount(goodsorderBackDTO.getMoney().multiply(new BigDecimal(100)));
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setCreator(principal.getId());
            refundDTO.setCreator(creator);
            refundDTO.setReason(goodsorderBackDTO.getReason());
            refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
            //退货退款 查看套餐订单状态 更新订单信息
@@ -1031,7 +1049,7 @@
                    //操作日志
                    DiscountLog discountLog = new DiscountLog();
                    discountLog.setIsdeleted(Constants.ZERO);
                    discountLog.setCreator(principal.getId());
                    discountLog.setCreator(creator);
                    discountLog.setCreateDate(new Date());
                    discountLog.setDiscountMemberId(discountMember.getId());
                    discountLog.setType(Constants.ONE);
@@ -1142,7 +1160,7 @@
            model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
            model.setRefundMoney(Constants.translateMoney(Constants.formatDecimalNum(refund.getMoney())));
        }
        model.setClosedMoney(model.getPayMoney().subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
        model.setClosedMoney(model.getPayMoney().add(model.getDiscountMoney()).subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
        return  model;
    }
    @Override
@@ -1359,7 +1377,7 @@
        request.setOutTradeNo(goodsorder.getId());
        request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//这个回调url必须是https开头的
        Amount amount = new Amount();
        amount.setTotal(goodsorder.getMoney().intValue());
        amount.setTotal(1);//goodsorder.getMoney().intValue());
        request.setAmount(amount);
//        PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
            // 跟之前下单示例一样，填充预下单参数