gongfuzhu 9 місяців тому
батько
коміт
df972e2781

+ 8 - 2
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/QiuXiangServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zswl.cloud.springBtach.server.core.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 
@@ -55,18 +57,20 @@ public class QiuXiangServiceImpl implements QiuXiangService {
 
         JSONObject orderExtend = qiuXiangApi.orderDelit(orderId);
         OrderDelitResponse orderDelitResponse = orderExtend.toBean(OrderDelitResponse.class);
-        com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("有票票");
+        com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("秋香");
         if (!shopSetting.getState().equals(com.zswl.cloud.shop.client.ret.ResultState.Success)) {
             return ResultContent.build(ResultState.Fail, "秋香信息未配置");
         }
 
         BigDecimal totalPrice = BigDecimal.valueOf(orderDelitResponse.getTotalPrice());
         AccountDetailVo content = shopSetting.getContent();
+        JSONObject entries1 = JSONUtil.parseObj(content);
+        entries1.set("shopName", "秋香代驾");
         CreateOrder2Model createOrder2Model = new CreateOrder2Model();
         createOrder2Model.setChannel(orderRequest.getChannel());
         createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
         createOrder2Model.setShopId(content.getAccountId());
-        createOrder2Model.setShopInfo(JSONUtil.parseObj(content));
+        createOrder2Model.setShopInfo(entries1);
         createOrder2Model.setTotalAmount(totalPrice);
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalPrice);
@@ -76,6 +80,8 @@ public class QiuXiangServiceImpl implements QiuXiangService {
         goods.setJobFlowMap(JobFlowMap.QiuXiang);
         JSONObject goodsInfo = JSONUtil.parseObj(orderRequest);
         goodsInfo.set("channelOrderId", orderId);
+        goodsInfo.set("goodsPath", "http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/65fe8e5874d67a7dbd842c5a/ext/GOODS_INFO/微信截图_20240823164958@2x.png/1.png");
+        goodsInfo.set("goodsName", DateUtil.format(new Date(), "MM月dd代驾行程"));
         goods.setGoodsInfo(goodsInfo);
         goods.setExtend(JSONUtil.parseObj(orderDelitResponse));
         goods.setPayAmount(BigDecimal.valueOf(orderDelitResponse.getTotalPrice()));