|
@@ -7,11 +7,11 @@ import cn.hutool.json.JSONUtil;
|
|
|
import com.github.microservice.auth.client.content.ResultContent;
|
|
|
import com.github.microservice.auth.client.content.ResultState;
|
|
|
import com.github.microservice.auth.security.helper.AuthHelper;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
|
+import com.zhongshu.payment.client.model.order.v2.*;
|
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
|
+import com.zhongshu.payment.client.service.v2.PaymentService2;
|
|
|
import com.zhongshu.payment.client.type.JobFlowMap;
|
|
|
+import com.zhongshu.payment.client.type.OrderType;
|
|
|
import com.zhongshu.payment.client.type.TransferOwner;
|
|
|
import com.zhongshu.payment.client.type.TransferType;
|
|
|
import com.zswl.cloud.shop.client.service.ShopService;
|
|
@@ -54,6 +54,9 @@ public class YppService {
|
|
|
@Autowired
|
|
|
private ApiLogDao apiLogDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private PaymentService2 paymentService2;
|
|
|
+
|
|
|
|
|
|
public ResultContent<CreatOrderResultModel> create_order(CreateOrder2Request createOrder2Request) {
|
|
|
com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("有票票");
|
|
@@ -182,11 +185,26 @@ public class YppService {
|
|
|
apiLogDao.save(apiLog);
|
|
|
|
|
|
ResultContent<GoodsResultModel> channelGoods = orderService2.findChannelGoods(JobFlowMap.YPP, syncOrderRequest.getData().getId());
|
|
|
- GoodsResultModel content = channelGoods.getContent();
|
|
|
- if (syncOrderRequest.getData().getState().equals(0)){
|
|
|
-
|
|
|
+ GoodsResultModel goodsResultModel = channelGoods.getContent();
|
|
|
+ UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
+ updateGoodsModel.setId(goodsResultModel.getId());
|
|
|
+ JSONObject entries = JSONUtil.parseObj(goodsResultModel.getExtend());
|
|
|
+ entries.put("sync", syncOrderRequest.getData());
|
|
|
+ updateGoodsModel.setExtend(entries.toString());
|
|
|
+
|
|
|
+ if (syncOrderRequest.getData().getState().equals(4)) {
|
|
|
+
|
|
|
+ updateGoodsModel.setGoodsState(OrderType.USED);
|
|
|
+ } else if (syncOrderRequest.getData().getState().equals(7)) {
|
|
|
+ ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
|
|
|
+ applicantRefundParam2Model.setId(goodsResultModel.getId());
|
|
|
+ applicantRefundParam2Model.setRemark("有票票出票失败退款:" + syncOrderRequest.getData().getRefundAmount());
|
|
|
+ applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
|
|
|
+ paymentService2.applicantRefund(applicantRefundParam2Model);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ orderService2.updateGoods(updateGoodsModel);
|
|
|
return "成功";
|
|
|
|
|
|
}
|