From 3480f3f9ea391b31a9774d57d6bf2e2551bfa67a Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 18 Jul 2022 16:55:48 +0800 Subject: [PATCH] // tt refund --- .../java/com/iformall/domain/po/WxRefundOrder.java | 4 ++++ .../service/impl/TtGoodsCategoryServiceImpl.java | 12 +++++++----- .../service/impl/WxRefundOrderServiceImpl.java | 6 +++++- .../main/resources/mapper/WxRefundOrderMapper.xml | 7 +------ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index 2ab1c12df..55ee9f43e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -44,6 +44,10 @@ public class WxRefundOrder extends TenantEntity { private Integer refundOrderStatus; @io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId") private String refundId; + @io.swagger.annotations.ApiModelProperty(value="退款原因",name="refundReason") + private String refundReason; + @io.swagger.annotations.ApiModelProperty(value="退款补充说明",name="refundDescription") + private String refundDescription; @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") private String failReason; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java index e4e54deac..ed955192b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java @@ -54,7 +54,7 @@ public class TtGoodsCategoryServiceImpl implements TtGoodsCategoryService { private List getProductAdminIsNotShowKey(){ List keyList = new ArrayList<>(); - keyList.add("appointment"); //预约信息 默认不可预约 +// keyList.add("appointment"); //预约信息 默认不可预约 keyList.add("auto_renew"); //是否开启自动延期 默认不开启 // keyList.add("bring_out_meal"); //是否可以外带餐食 默认否 // keyList.add("can_no_use_date");//不可使用日期 默认无 @@ -147,10 +147,12 @@ public class TtGoodsCategoryServiceImpl implements TtGoodsCategoryService { for (GoodsTemplateGet.ProductAttrs attr: productAttrs) { //预约信息 默认不可预约 if("appointment".equals(attr.getKey())){ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("need_appointment",false); - jsonObject.put("ahead_day_num",0); - attr.setData(jsonObject.toJSONString()); + if(StringUtils.isBlank(attr.getData())){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("need_appointment",false); + jsonObject.put("ahead_day_num",0); + attr.setData(jsonObject.toJSONString()); + } } //是否开启自动延期 默认不开启 else if("auto_renew".equals(attr.getKey())){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index d5e4efe97..1777f3cb7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -24,6 +25,7 @@ import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult; import com.iformall.service.pay.service.refund.entity.RefundAdapterResult; import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult; +import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -981,10 +983,12 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setCUserId(memberId); record.setTotalFee(wxOrder.getPayment()); record.setRefundFee(refundOrderCallback.getRefundTotalAmount()); - record.setRefundTimeStart(currentDate); + record.setRefundTimeStart(new Date(refundOrderCallback.getCreateRefundTime())); record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); record.setRefundVendor(wxOrder.getPayVendor()); record.setRefundId(refundOrderCallback.getRefundId()); + record.setRefundReason(JSON.toJSONString(refundOrderCallback.getRefundReason())); + record.setRefundDescription(refundOrderCallback.getRefundDescription()); // 退款订单 try { int sqlRow = wxRefundOrderMapper.insert(record); diff --git a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml index 2afdd524e..b95409231 100644 --- a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml @@ -126,10 +126,5 @@ from wx_refund_order - - - - - - +