Просмотр исходного кода

[退券退款][修改]

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
cc0cb4d15a
5 измененных файлов: 30 добавлений и 1 удалений
  1. +18
    -0
      mallinkService/src/main/java/com/simple/pay/WxRefundOrderP.java
  2. +2
    -0
      mallinkService/src/main/java/com/simple/service/WxOrderService.java
  3. +6
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java
  5. +2
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java

+ 18
- 0
mallinkService/src/main/java/com/simple/pay/WxRefundOrderP.java Просмотреть файл

@@ -13,6 +13,8 @@ public class WxRefundOrderP {
private String out_refund_no; // 商户退款单号
private Integer total_fee; // 支付金额
private Integer refund_fee; // 退款金额
private String refund_desc; // 退款原因
private String notify_url; // 回调接口

public String getAppid() {
return appid;
@@ -86,6 +88,22 @@ public class WxRefundOrderP {
this.refund_fee = refund_fee;
}

public String getRefund_desc() {
return refund_desc;
}

public void setRefund_desc(String refund_desc) {
this.refund_desc = refund_desc;
}

public String getNotify_url() {
return notify_url;
}

public void setNotify_url(String notify_url) {
this.notify_url = notify_url;
}

@Override
public String toString() {
final StringBuilder sb = new StringBuilder("WxRefundOrder{");


+ 2
- 0
mallinkService/src/main/java/com/simple/service/WxOrderService.java Просмотреть файл

@@ -87,4 +87,6 @@ public interface WxOrderService {

WxOrderCVo detailCUserVo(WxOrder record);

void stockBack(WxOrder updateOrder);

}

+ 6
- 0
mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -15,6 +15,7 @@ import com.simple.enums.EnumCouponOrderStatus;
import com.simple.exception.MallinkException;
import com.simple.mapper.*;
import com.simple.service.WxCouponOrderService;
import com.simple.service.WxOrderService;
import org.apache.log4j.Logger;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +49,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Autowired
WxCUserMapper wxCUserMapper;

@Autowired
WxOrderService wxOrderService;

@Override
public PageInfo<WxCouponOrder> listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record));
@@ -369,6 +373,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
logger.error("db failed: couponOrder-" + couponOrderId + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
// 库存回复+1
wxOrderService.stockBack(wxOrder);
return new ResultData(wxCouponOrder);
}



+ 2
- 1
mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -140,7 +140,8 @@ public class WxOrderServiceImpl implements WxOrderService {
}
}

private void stockBack(WxOrder updateOrder) {
@Override
public void stockBack(WxOrder updateOrder) {
// 已取消/已退款,库存加1
// 获取订单相关coupon
Long couponId = updateOrder.getCouponId();


+ 2
- 0
mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java Просмотреть файл

@@ -268,6 +268,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
wxRefundOrderP.setOut_refund_no(out_refund_id);
wxRefundOrderP.setTotal_fee(record.getTotalFee());
wxRefundOrderP.setRefund_fee(record.getRefundFee());
wxRefundOrderP.setRefund_desc("B端商户退款");
wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund");

if (isReal) {
Map signMap = new HashMap();


Загрузка…
Отмена
Сохранить