fix

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/OrderServiceImp.java

@@ -13,6 +13,9 @@ import com.zhongshu.payment.client.type.ErrorCode;
 import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.JobFlowType;
 import com.zhongshu.payment.client.type.OrderType;
+import com.zswl.cloud.shop.client.service.ShopService;
+import com.zswl.cloud.shop.client.vo.life.EmployeeDetailVo;
+import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
 import com.zswl.cloud.springBatch.client.service.OrderService;
 import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarVerificationJob;
@@ -61,6 +64,11 @@ public class OrderServiceImp implements OrderService {
     @Autowired
     AuthHelper authHelper;
 
+
+    @Autowired
+    ShopService shopService;
+
+
     private final String redisKey = "use_";
 
 
@@ -111,18 +119,31 @@ public class OrderServiceImp implements OrderService {
     @SneakyThrows
     public ResultContent verification(String token) {
 
+
+
         Object id = redisHelper.getValue(redisKey + token);
         if (ObjectUtil.isEmpty(id)) {
             return ResultContent.build(ResultState.Fail, ErrorCode.CQ_TIME_OUTE.getMess());
         }
 
+        String enterPriseId = authHelper.getEnterPriseId();
+
         VerificationModel verificationModel = new VerificationModel();
 
         // todo 构建核销的商家信息
         JSONObject entries = new JSONObject();
 
+
+        com.zswl.cloud.shop.client.ret.ResultContent<EmployeeDetailVo> employee = shopService.getEmployee(authHelper.getCurrentUser().getUserId());
+        EmployeeDetailVo employeeContent = employee.getContent();
+        com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail = shopService.detail(enterPriseId);
+        ShopDetailVo shopDetailVo = detail.getContent();
+        entries.set("shopName",shopDetailVo.getShopName());
+        entries.set("employeeName",employeeContent.getEmployeeName());
+
         verificationModel.setVerification(entries);
         verificationModel.setId((String) id);
+        verificationModel.setShopId(enterPriseId);
 
         ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.qrGoods(String.valueOf(id));
         if (!goodsResultModelResultContent.getState().equals(ResultState.Success)) {