|
@@ -2,6 +2,7 @@ package com.zswl.cloud.springBtach.server.core.service.impl;
|
|
|
|
|
|
import cn.hutool.core.lang.Snowflake;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+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;
|
|
@@ -106,12 +107,13 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
createOrder2Model.setPayAmount(payAmount);
|
|
|
createOrder2Model.setAccesserUserId(authAccount);
|
|
|
createOrder2Model.setChannel(createOrderNewRequest.getChannel());
|
|
|
-
|
|
|
+ JSONObject goodsInfo = JSONUtil.parseObj(createOrderNewRequest2);
|
|
|
+ goodsInfo.set("orderId",createOrderNewResponse.getData().getOrderId());
|
|
|
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
|
goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
|
|
|
goods.setJobFlowMap(JobFlowMap.Ticket);
|
|
|
- goods.setGoodsInfo(JSONUtil.parseObj(createOrderNewRequest2));
|
|
|
+ goods.setGoodsInfo(goodsInfo);
|
|
|
goods.setPayAmount(payAmount);
|
|
|
goods.setValidDay(30);
|
|
|
goods.setTransferType(shopDetailVo.getShareType().equals(1) ? TransferType.RATIO : TransferType.FIXED);
|