From 8e5cffef522c32eb1b3f068be411d238a9d4e89a Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期四, 19 十月 2023 09:09:05 +0800 Subject: [PATCH] #单位提交 分转换元 --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java index 8d6bc6e..7aecc5e 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java @@ -343,12 +343,13 @@ if (!CollectionUtils.isEmpty(refunds)){ refunds.forEach(s->{ PayOrderDTO refundOrderDTO = new PayOrderDTO(); - refundOrderDTO.setOrderCode(s.getCode()); + refundOrderDTO.setOrderCode(s.getObjId()); refundOrderDTO.setId(s.getId()); refundOrderDTO.setPayWay(s.getPayWay()); refundOrderDTO.setRefundType(s.getType()); refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney())); refundOrderDTO.setPayDate(s.getDoneDate()); + refundOrderDTO.setOnlineorderId(s.getOnlineOrderid()); payOrderDTOList.add(refundOrderDTO); }); } @@ -409,7 +410,7 @@ update.setId(goodsorder.getId()); update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey()); update.setCloseMoney(goodsorder.getMoney()); - update.setCloseDate(goodsorder.getEndDate()); + update.setCloseDate(new Date()); update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo()); update.setCloseUserId(goodsorder.getEditor()); if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){ -- Gitblit v1.9.3