|
@@ -5,9 +5,12 @@ import cn.hutool.json.JSONUtil;
|
|
import com.github.microservice.auth.client.content.ResultContent;
|
|
import com.github.microservice.auth.client.content.ResultContent;
|
|
import com.github.microservice.auth.client.content.ResultState;
|
|
import com.github.microservice.auth.client.content.ResultState;
|
|
import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
|
|
+import com.zhongshu.payment.client.model.order.v2.UpdateGoodsModel;
|
|
import com.zhongshu.payment.client.model.order.v2.VerificationModel;
|
|
import com.zhongshu.payment.client.model.order.v2.VerificationModel;
|
|
|
|
+import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
import com.zhongshu.payment.client.service.v2.PaymentService2;
|
|
import com.zhongshu.payment.client.service.v2.PaymentService2;
|
|
|
|
+import com.zhongshu.payment.client.type.OrderType;
|
|
import com.zswl.cloud.shop.client.service.GoodsService;
|
|
import com.zswl.cloud.shop.client.service.GoodsService;
|
|
import com.zswl.cloud.springBtach.server.core.api.video.YqdCreateRequestModel;
|
|
import com.zswl.cloud.springBtach.server.core.api.video.YqdCreateRequestModel;
|
|
import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
|
|
import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
|
|
@@ -56,42 +59,47 @@ public class VideoDeliveryJob {
|
|
String account = String.valueOf(entries.get("account"));
|
|
String account = String.valueOf(entries.get("account"));
|
|
|
|
|
|
|
|
|
|
- VerificationModel verificationModel = new VerificationModel();
|
|
|
|
- verificationModel.setId(goodsResultModel.getId());
|
|
|
|
- verificationModel.setShopId(goodsResultModel.getShopId());
|
|
|
|
- verificationModel.setVerification(new JSONObject());
|
|
|
|
- ResultContent verification = orderService2.verification(verificationModel);
|
|
|
|
- if (!verification.getState().equals(ResultState.Success)){
|
|
|
|
-
|
|
|
|
- log.info("核销状态变更失败:{}",JSONUtil.toJsonStr(goodsResultModel));
|
|
|
|
- getResultContent().set(ResultContent.build(ResultState.Fail));
|
|
|
|
- return RepeatStatus.FINISHED;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-// OrderDto orderDto = new OrderDto();
|
|
|
|
-// orderDto.setCommodityId(goodsResultModel.getGoodsId());
|
|
|
|
-// orderDto.setPhone(account);
|
|
|
|
-// ResultContent resultContent = yqdServiceImpl.create(orderDto);
|
|
|
|
|
|
|
|
|
|
+ // 调用三方充值
|
|
YqdCreateRequestModel createRequestModel = new YqdCreateRequestModel();
|
|
YqdCreateRequestModel createRequestModel = new YqdCreateRequestModel();
|
|
createRequestModel.setBuyCount(1);
|
|
createRequestModel.setBuyCount(1);
|
|
- createRequestModel.setExternal_orderno(goodsResultModel.getOrderNo());
|
|
|
|
|
|
+ createRequestModel.setExternal_orderno(goodsResultModel.getId());
|
|
createRequestModel.setCommodityId(goodsResultModel.getGoodsId());
|
|
createRequestModel.setCommodityId(goodsResultModel.getGoodsId());
|
|
createRequestModel.setTemplate(List.of(account));
|
|
createRequestModel.setTemplate(List.of(account));
|
|
createRequestModel.setExternalSellPrice(goodsResultModel.getPayAmount());
|
|
createRequestModel.setExternalSellPrice(goodsResultModel.getPayAmount());
|
|
createRequestModel.setRemark(goodsResultModel.getUserId());
|
|
createRequestModel.setRemark(goodsResultModel.getUserId());
|
|
-
|
|
|
|
-
|
|
|
|
ResultContent yqdServiceImpl2 = yqdServiceImpl.create2(createRequestModel);
|
|
ResultContent yqdServiceImpl2 = yqdServiceImpl.create2(createRequestModel);
|
|
log.info("视频会员响应结果:{}", yqdServiceImpl2.getContent());
|
|
log.info("视频会员响应结果:{}", yqdServiceImpl2.getContent());
|
|
if (!yqdServiceImpl2.getState().equals(ResultState.Success)) {
|
|
if (!yqdServiceImpl2.getState().equals(ResultState.Success)) {
|
|
getResultContent().set(ResultContent.build(ResultState.Fail));
|
|
getResultContent().set(ResultContent.build(ResultState.Fail));
|
|
return RepeatStatus.FINISHED;
|
|
return RepeatStatus.FINISHED;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // 分账
|
|
|
|
+ ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(goodsResultModel.getId(), goodsResultModel.getShopId());
|
|
|
|
+ if (!subOrdersConfirmResponseModelResultContent.getState().equals(ResultState.Success)){
|
|
|
|
+ log.info("分账失败:{}",JSONUtil.toJsonStr(goodsResultModel));
|
|
|
|
+ getResultContent().set(ResultContent.build(ResultState.Fail));
|
|
|
|
+ return RepeatStatus.FINISHED;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ VerificationModel verificationModel = new VerificationModel();
|
|
|
|
+ verificationModel.setId(goodsResultModel.getId());
|
|
|
|
+ verificationModel.setShopId(goodsResultModel.getShopId());
|
|
|
|
+ verificationModel.setVerification(new JSONObject());
|
|
String extend = goodsResultModel.getExtend();
|
|
String extend = goodsResultModel.getExtend();
|
|
JSONObject entries1 = JSONUtil.parseObj(extend);
|
|
JSONObject entries1 = JSONUtil.parseObj(extend);
|
|
- entries1.set("response", yqdServiceImpl2.getContent());
|
|
|
|
- orderService2.updateExtend(goodsResultModel.getId(), JSONUtil.toJsonStr(entries1));
|
|
|
|
|
|
+ entries1.set("create", yqdServiceImpl2.getContent());
|
|
|
|
+
|
|
|
|
+ UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
|
+ updateGoodsModel.setId(goodsResultModel.getId());
|
|
|
|
+ updateGoodsModel.setDelivery(true);
|
|
|
|
+ updateGoodsModel.setVerifyModel(entries1);
|
|
|
|
+ updateGoodsModel.setGoodsState(OrderType.USED);
|
|
|
|
+ updateGoodsModel.setVerifyModel(JSONUtil.parseObj(verificationModel));
|
|
|
|
+ orderService2.updateGoods(updateGoodsModel);
|
|
|
|
+
|
|
getResultContent().set(ResultContent.build(ResultState.Success));
|
|
getResultContent().set(ResultContent.build(ResultState.Success));
|
|
return RepeatStatus.FINISHED;
|
|
return RepeatStatus.FINISHED;
|
|
|
|
|