feat: 阿拉钉结算回调发起完单操作修改

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/listener/OladingFinishTaskEventListener.java

@@ -1,12 +1,34 @@
 package com.qunzhixinxi.hnqz.admin.listener;
 
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.config.TaxNotifyConfig;
+import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.event.OladingFinishTaskEvent;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
 import com.qunzhixinxi.hnqz.admin.service.gig.GigThirdApiService;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author: lixuesong
@@ -15,15 +37,16 @@ import org.springframework.scheduling.annotation.Async;
  */
 @Slf4j
 @AllArgsConstructor
+@Configuration
 public class OladingFinishTaskEventListener {
-
 	private final GigThirdApiService gigThirdApiService;
 
 	@Async
 	@Order
 	@EventListener(OladingFinishTaskEvent.class)
 	public void pushEvent(OladingFinishTaskEvent event) {
-		log.info("阿拉钉完单操作事件开始触发");
+
 		event.getNoteList().forEach(gigThirdApiService::finishTask);
 	}
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/GigThirdApiServiceImpl.java

@@ -257,9 +257,11 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			}
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + tmp.getId());
 
-			// 异步发起完单操作，是否成功不做处理
+			// 如果结算成功，则异步发起完单操作，是否成功不做处理
 			try {
-				applicationEventPublisher.publishEvent(new OladingFinishTaskEvent(noteList));
+				if (yaoyiStatus == 1) {
+					applicationEventPublisher.publishEvent(new OladingFinishTaskEvent(noteList));
+				}
 			} catch (Exception e) {
 				log.warn("阿拉钉异步发起完单操作异常requestId={}", requestId);
 				log.error("阿拉钉异步发起完单操作异常", e);