|
|
@@ -1,6 +1,5 @@
|
|
|
package com.zswl.cloud.springBtach.server.core.job.ypp;
|
|
|
|
|
|
-import cn.hutool.json.JSONObject;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.github.microservice.auth.client.content.ResultContent;
|
|
|
import com.github.microservice.auth.client.content.ResultState;
|
|
|
@@ -12,11 +11,10 @@ import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
|
import com.zhongshu.payment.client.service.v2.PaymentService2;
|
|
|
import com.zhongshu.payment.client.type.OrderType;
|
|
|
import com.zswl.cloud.shop.client.service.ShopService;
|
|
|
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrdereResponse;
|
|
|
+import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
|
|
|
import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
|
|
|
import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
|
|
|
import com.zswl.cloud.springBtach.server.core.job.standard.StandarDeliveryJob;
|
|
|
-import com.zswl.cloud.springBtach.server.core.job.standard.StandarOrderJob;
|
|
|
import lombok.Data;
|
|
|
import lombok.experimental.Delegate;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
|
@@ -28,9 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
@Data
|
|
|
@Configuration
|
|
|
@Log4j2
|
|
|
@@ -66,8 +61,8 @@ public class YppDeliveryJob {
|
|
|
|
|
|
GoodsResultModel goodsResultModel = getParameter().get();
|
|
|
String extend = goodsResultModel.getExtend();
|
|
|
- CreateOrdereResponse bean = JSONUtil.toBean(extend, CreateOrdereResponse.class);
|
|
|
- yppApi.pay_order(bean.getData());
|
|
|
+ CreateOrder2Response bean = JSONUtil.toBean(extend, CreateOrder2Response.class);
|
|
|
+ yppApi.pay_order(bean.getData().getOrderId());
|
|
|
|
|
|
// 分账
|
|
|
ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(goodsResultModel.getId(), goodsResultModel.getShopId());
|
