소스 검색

修改测试环境下的财务模块配置

songyh 4 년 전
부모
커밋
f7f99c1bda

+ 0 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -85,9 +85,6 @@ public class CwjsPolicyInfoController {
 	 CorpWexinUtils corpWexinUtils;
 	 @Resource
 	 MailLogMapper mailLogMapper;
-	 @Autowired
-	 private IMaterialReportOverViewService materialReportOverViewService;
-
 
 	 @GetMapping(value = "/queryApprovalRejectReason")
 	 public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){

+ 7 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1890,6 +1890,13 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                     JSONObject dataJson = resultJson.getJSONObject("data");
                     if (!Check.isNullMap(dataJson)) {
                         JSONObject returnJson = new JSONObject();
+                        returnJson.put("isAdWatch5times",dataJson.getInteger("is_ad_watch_5_times"));
+                        returnJson.put("isAdWatch20times",dataJson.getInteger("is_ad_watch_20_times"));
+                        returnJson.put("isAdWatch10Times",dataJson.getInteger("is_ad_watch_10_times"));
+                        returnJson.put("isSevenDayRoi",dataJson.getInteger("is_seven_day_roi"));
+                        returnJson.put("isAppointJumpClick",dataJson.getInteger("is_appoint_jump_click"));
+                        returnJson.put("isEventWeekPayTimes",dataJson.getInteger("is_event_week_pay_times"));
+                        returnJson.put("isAppointForm",dataJson.getInteger("is_appoint_form"));
                         returnJson.put("isActivate", dataJson.getInteger("is_activate"));
                         returnJson.put("isFormSubmit", dataJson.getInteger("is_form_submit"));
                         returnJson.put("isCreditGrant", dataJson.getInteger("is_credit_grant"));
@@ -1903,9 +1910,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         returnJson.put("isAppInvoked", dataJson.getInteger("is_app_invoked"));
                         returnJson.put("isMultiConversion", dataJson.getInteger("is_multi_conversion"));
                         returnJson.put("isAdWatchTimes", dataJson.getInteger("is_ad_watch_times"));
-                        returnJson.put("isAppInvoked", dataJson.getInteger("is_app_invoked"));
-                        returnJson.put("isMultiConversion", dataJson.getInteger("is_multi_conversion"));
-                        returnJson.put("isAdWatchTimes", dataJson.getInteger("is_ad_watch_times"));
                         returnJson.put("isOrderPaied", dataJson.getInteger("is_order_paied"));
                         returnJson.put("isKeyAction", dataJson.getInteger("is_key_action"));
 

+ 2 - 2
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application-test.yml

@@ -43,13 +43,13 @@ spring:
         filters:
           - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
         predicates:
-          - Path=/bytedance/ad/**
+          - Path=/bytedanceAd/**
       - id: jeecg-cloud-finance
         uri: lb://jeecg-cloud-finance
         filters:
           - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
         predicates:
-          - Path=/finance
+          - Path=/finance/**
 # hystrix 信号量隔离,3秒后自动超时
 hystrix:
   enabled: true