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

//msg ttpay

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
4905d22d9e
2 измененных файлов: 9 добавлений и 9 удалений
  1. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java

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

@@ -151,9 +151,9 @@ public class WxOrderController extends BaseController {
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
if(EnumPayWay.PAY_WAY_TT.equals(getPayWay())){
return new ResultData(Result.ERROR,"测试阶段,暂无法支付");
}
// if(EnumPayWay.PAY_WAY_TT.equals(getPayWay())){
// return new ResultData(Result.ERROR,"测试阶段,暂无法支付");
// }
List<OrderComposeSaveDto> list = new ArrayList<>();
OrderComposeSaveDto dto = new OrderComposeSaveDto();
dto.setSignleOrder(orderSaveDto);


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Просмотреть файл

@@ -127,12 +127,12 @@ public class TtPayShareService extends PayShareBaseAdapterService{
list.add(settleParams);
mall_account += jo.getInteger("amount") - (jo.getInteger("rateAmount") == null?0:jo.getInteger("rateAmount"));
}
if(mall_account > 0){
Map<String,Object> settleParams = new HashMap<>();
settleParams.put("merchant_uid",payAccount.getSubMchId());
settleParams.put("amount",mall_account);
list.add(settleParams);
}
// if(mall_account > 0){
// Map<String,Object> settleParams = new HashMap<>();
// settleParams.put("merchant_uid",payAccount.getSubMchId());
// settleParams.put("amount",mall_account);
// list.add(settleParams);
// }
request.setSettleParams(JSON.toJSONString(list));
String settleId = ttPayService.getProfitSharingV2Service().profitSharing(request);
return new PayShareResult(true, null,"success", null,settleId);


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