jiangping
2023-10-18 d00f345e88363d1d2d75350f27ee4b6348d30219
Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
已修改3个文件
23 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,13 +46,12 @@
            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()));
            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(1);
            request.setRefundFee(1);
//            request.setTotalFee(1);
//            request.setRefundFee(1);
            WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
            if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
                //存储退款记录 与 流水记录
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
@@ -38,4 +38,8 @@
    @ApiModelProperty(value = "创建时间开始")
    private Date createDate;
    @ApiModelProperty(value = "现场描述")
    @ExcelColumn(name="现场描述")
    private String content;
}
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -691,8 +691,8 @@
            request.setBody("支付押金");
            request.setAttach("createGoodsOrder");
            request.setOutTradeNo(goodsorder.getId());
//            request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
            request.setTotalFee(1);
            request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
//            request.setTotalFee(1);
            request.setSpbillCreateIp(this.getIpAddr());
            request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
            request.setOpenid(member.getOpenid());
@@ -751,8 +751,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){