|
@@ -4,10 +4,7 @@ import com.github.microservice.auth.client.content.ResultContent;
|
|
import com.github.microservice.auth.security.helper.AuthHelper;
|
|
import com.github.microservice.auth.security.helper.AuthHelper;
|
|
import com.github.microservice.auth.security.model.AuthDetails;
|
|
import com.github.microservice.auth.security.model.AuthDetails;
|
|
import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
|
|
import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
|
|
-import com.zhongshu.payment.client.model.order.v2.ApplicantRefundParam2Model;
|
|
|
|
-import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
|
|
-import com.zhongshu.payment.client.model.order.v2.RefundParam2Model;
|
|
|
|
-import com.zhongshu.payment.client.model.order.v2.WithdrawRequestModel;
|
|
|
|
|
|
+import com.zhongshu.payment.client.model.order.v2.*;
|
|
import com.zhongshu.payment.client.model.payment.QueryResponseModel;
|
|
import com.zhongshu.payment.client.model.payment.QueryResponseModel;
|
|
import com.zhongshu.payment.client.model.payment.zswl.*;
|
|
import com.zhongshu.payment.client.model.payment.zswl.*;
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
@@ -91,7 +88,7 @@ public class PaymentService {
|
|
|
|
|
|
public ResultContent refundIntervene(String goodsId) {
|
|
public ResultContent refundIntervene(String goodsId) {
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
- return paymentService2.refundIntervene(userId,goodsId);
|
|
|
|
|
|
+ return paymentService2.refundIntervene(userId, goodsId);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -153,10 +150,15 @@ public class PaymentService {
|
|
|
|
|
|
return paymentService2.withdrawalsOrderList(withdrawRequestModel);
|
|
return paymentService2.withdrawalsOrderList(withdrawRequestModel);
|
|
}
|
|
}
|
|
|
|
+
|
|
public ResultContent withdrawalsList(WithdrawRequestModel withdrawRequestModel) {
|
|
public ResultContent withdrawalsList(WithdrawRequestModel withdrawRequestModel) {
|
|
return paymentService2.withdrawalsList(withdrawRequestModel);
|
|
return paymentService2.withdrawalsList(withdrawRequestModel);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public ResultContent withdrawalsDetail(WithdrawDetailRequestModel withdrawDetailRequestModel) {
|
|
|
|
+ return paymentService2.withdrawalsDetail(withdrawDetailRequestModel);
|
|
|
|
+ }
|
|
|
|
+
|
|
public ResultContent withdrawalsDetailList(WithdrawRequestModel withdrawRequestModel) {
|
|
public ResultContent withdrawalsDetailList(WithdrawRequestModel withdrawRequestModel) {
|
|
String enterPriseId = authHelper.getEnterPriseId();
|
|
String enterPriseId = authHelper.getEnterPriseId();
|
|
withdrawRequestModel.setShopId(enterPriseId);
|
|
withdrawRequestModel.setShopId(enterPriseId);
|
|
@@ -175,8 +177,6 @@ public class PaymentService {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
public ResultContent subOrdersConfirm(String goodsId, String useShopId) {
|
|
public ResultContent subOrdersConfirm(String goodsId, String useShopId) {
|
|
return paymentService2.subOrdersConfirm(goodsId, useShopId);
|
|
return paymentService2.subOrdersConfirm(goodsId, useShopId);
|
|
}
|
|
}
|