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

jiaosong

2023-10-18 dbd141aa06a85255117ebeb812a0fc4a8ef541f2

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

 server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java

@@ -46,10 +46,10 @@
            WxPayRefundRequest request = new WxPayRefundRequest();
            request.setOutTradeNo(refundDTO.getOrderId());
            request.setOutRefundNo(refNum);
            request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
            request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
            System.out.println("实际总金额" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
            System.out.println("实际退款金额" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
            request.setTotalFee(refundDTO.getTotalAmount().intValue());
            request.setRefundFee(refundDTO.getRefundAmount().intValue());
            System.out.println("实际总金额" + refundDTO.getTotalAmount());
            System.out.println("实际退款金额" + refundDTO.getRefundAmount());
//            request.setTotalFee(1);
//            request.setRefundFee(1);
            WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);

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

@@ -248,7 +248,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());
@@ -678,7 +678,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 +691,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());