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

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230605

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
b627b58f07
3 измененных файлов: 14 добавлений и 15 удалений
  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. +2
    -2
      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);
RefundOrderCallback refundOrderCallback = ttPayService.refundOrderNotifyV2Result(body, header);
@@ -824,7 +824,7 @@ public class WxOrderController extends BaseController {
tenantEntity.updateTenantInfo(mall);
}

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

if(resultData.code == 200){
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 退款回调创建退款订单
* @param tenantEntity
* @param memberId
* @param refundOrderCallback
* @return
*/
ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback);
ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, RefundOrderCallback refundOrderCallback);

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



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

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

@Override
@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();
Long compseOrderId = Long.parseLong(outOrderNo);
@@ -1037,7 +1037,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
record.setUpdateTime(currentDate);
// 微信内部订单号
record.setTransactionId(refundOrderCallback.getOrderId());
record.setCUserId(memberId);
record.setCUserId(wxOrder.getCUserId());
record.setTotalFee(wxOrder.getPayment());
record.setRefundFee(refundOrderCallback.getRefundTotalAmount());
record.setRefundTimeStart(new Date(refundOrderCallback.getCreateRefundTime()));


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