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

//refund

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
15e2e5243c
3 измененных файлов: 25 добавлений и 26 удалений
  1. +11
    -11
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +1
    -2
      mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java
  3. +13
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java

+ 11
- 11
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -800,16 +800,16 @@ public class WxOrderController extends BaseController {
} }


//验证用户 //验证用户
Long memberId = null;
TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, appinfo.getTenantId());
if(cuser != null && cuser.getUserId() != null){
memberId = cuser.getUserId();
}
if(memberId == null){
map.put("err_no",ErrorCode.USER_NOT_MEMBER.getCode());
map.put("err_tips",ErrorCode.USER_NOT_MEMBER.getMessage());
return map;
}
// Long memberId = null;
// TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, appinfo.getTenantId());
// if(cuser != null && cuser.getUserId() != null){
// memberId = cuser.getUserId();
// }
// if(memberId == null){
// map.put("err_no",ErrorCode.USER_NOT_MEMBER.getCode());
// map.put("err_tips",ErrorCode.USER_NOT_MEMBER.getMessage());
// return map;
// }


TtPayService ttPayService = maUtil.getTtPayService(appinfo, payAccount); TtPayService ttPayService = maUtil.getTtPayService(appinfo, payAccount);
RefundOrderCallback refundOrderCallback = ttPayService.refundOrderNotifyV2Result(body, header); RefundOrderCallback refundOrderCallback = ttPayService.refundOrderNotifyV2Result(body, header);
@@ -824,7 +824,7 @@ public class WxOrderController extends BaseController {
tenantEntity.updateTenantInfo(mall); tenantEntity.updateTenantInfo(mall);
} }


ResultData resultData = wxRefundOrderService.ttCallBackCreateRefundOrder(tenantEntity,memberId,refundOrderCallback);
ResultData resultData = wxRefundOrderService.ttCallBackCreateRefundOrder(tenantEntity,refundOrderCallback);


if(resultData.code == 200){ if(resultData.code == 200){
WxRefundOrder refundOrder = (WxRefundOrder) resultData.data; WxRefundOrder refundOrder = (WxRefundOrder) resultData.data;


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

@@ -108,11 +108,10 @@ public interface WxRefundOrderService {
/** /**
* 抖音2.0 退款回调创建退款订单 * 抖音2.0 退款回调创建退款订单
* @param tenantEntity * @param tenantEntity
* @param memberId
* @param refundOrderCallback * @param refundOrderCallback
* @return * @return
*/ */
ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback);
ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, RefundOrderCallback refundOrderCallback);


ResultData syncRefundOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxRefundOrder order); ResultData syncRefundOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxRefundOrder order);




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

@@ -876,7 +876,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


@Override @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback) {
public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, RefundOrderCallback refundOrderCallback) {


String outOrderNo = refundOrderCallback.getOutOrderNo(); String outOrderNo = refundOrderCallback.getOutOrderNo();
Long compseOrderId = Long.parseLong(outOrderNo); Long compseOrderId = Long.parseLong(outOrderNo);
@@ -978,17 +978,17 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
} }


// 卡退款,把卡余额设为0 // 卡退款,把卡余额设为0
if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) {
WxCardInfo updateCardInfo = new WxCardInfo();
updateCardInfo.setId(wxCouponOrder.getId());
updateCardInfo.setRemainingAmount(0);
try {
wxCardInfoMapper.updateById(updateCardInfo);
} catch (Exception e) {
logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
}
// if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) {
// WxCardInfo updateCardInfo = new WxCardInfo();
// updateCardInfo.setId(wxCouponOrder.getId());
// updateCardInfo.setRemainingAmount(0);
// try {
// wxCardInfoMapper.updateById(updateCardInfo);
// } catch (Exception e) {
// logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage());
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
// }
// }
} }


// WxPayOrder payOrderQ = new WxPayOrder(); // WxPayOrder payOrderQ = new WxPayOrder();
@@ -1033,7 +1033,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
record.setUpdateTime(currentDate); record.setUpdateTime(currentDate);
// 微信内部订单号 // 微信内部订单号
record.setTransactionId(refundOrderCallback.getOrderId()); record.setTransactionId(refundOrderCallback.getOrderId());
record.setCUserId(memberId);
record.setCUserId(wxOrder.getCUserId());
record.setTotalFee(wxOrder.getPayment()); record.setTotalFee(wxOrder.getPayment());
record.setRefundFee(refundOrderCallback.getRefundTotalAmount()); record.setRefundFee(refundOrderCallback.getRefundTotalAmount());
record.setRefundTimeStart(new Date(refundOrderCallback.getCreateRefundTime())); record.setRefundTimeStart(new Date(refundOrderCallback.getCreateRefundTime()));


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