Merge branch 'main' of http://192.168.40.220/etc_codes/9901Xz/qt.afl.after.sales into VehicleStatus

application.pid

@@ -0,0 +1 @@
+34940

src/main/java/com/qtzl/alterSales/manager/model/protocol/external/VehicleBlackListRequest.java

@@ -32,23 +32,8 @@ public class VehicleBlackListRequest extends SubBaseModel {
     /** 状态名单原因1-挂失;2-挂起;3-注销;4-支付渠道限制;5-车型不符 */
     @NotNull
     private Integer reason ;
-    @JsonIgnore
-    private String filename;
-
-//    public static VehicleBlackListRequest defaultConstruct(String vehicleId,LocalDateTime localDateTime, Integer type, Integer reason){
-//        DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
-//        String localDateStr = localDateTime.format(formatter);
-//        String filename = " PSS_ISSUE_HANDLEBLACKLIST_REQ_SENDER_"+localDateStr+".json";
-//        return   new VehicleBlackListRequest(){{
-//            setVehicleId(vehicleId);
-//            setType(type);
-//            setReason(reason);
-//            setCreateTime(localDateTime.format(formatter2));
-//            setFilename(filename);
-//        }};
-//    }
-
+    private String openId;
+    private String accessToken;
     public String getVehicleId() {
         return vehicleId;
     }
@@ -89,14 +74,6 @@ public class VehicleBlackListRequest extends SubBaseModel {
         return reason;
     }
 
-    public String getFilename() {
-        return filename;
-    }
-
-    public void setFilename(String filename) {
-        this.filename = filename;
-    }
-
     public String getCreateTime() {
         return createTime;
     }
@@ -104,4 +81,20 @@ public class VehicleBlackListRequest extends SubBaseModel {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
 }

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/VehicleStatusListChangeRequest.java

@@ -25,6 +25,8 @@ public class VehicleStatusListChangeRequest  extends BaseModel {
     private Integer reason ;
     /** 渠道id */
     private String uniqueKey ;
+    private String openId;
+    private String accessToken;
 
     public String getAgentId() {
         return agentId;
@@ -81,4 +83,20 @@ public class VehicleStatusListChangeRequest  extends BaseModel {
     public void setUniqueKey(String uniqueKey) {
         this.uniqueKey = uniqueKey;
     }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
 }

src/main/java/com/qtzl/alterSales/manager/quartz/AflMchStatisticsTask.java

@@ -32,7 +32,7 @@ public class AflMchStatisticsTask extends AbstractManager {
     @Resource
     private AflMchStatisticsLogRepo aflMchStatisticsLogRepo;
 
-    @Scheduled(cron = "0 0 2-4 * * ?")
+    @Scheduled(cron = "0 0 10-12 * * ?")
     public void run() {
         log.info("选装-微信商户号日账单统计 定时统计开始执行...");
         final String formatted = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));

src/main/java/com/qtzl/alterSales/manager/quartz/RefundStatsTask.java

@@ -8,6 +8,7 @@ import com.qtzl.alterSales.dao.repo.jpa.second.refund.RefundStatsRepo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
@@ -38,7 +39,7 @@ public class RefundStatsTask extends AbstractManager {
     /**
      * 每天凌晨两点执行退费统计
      */
-//    @Scheduled(cron = "0 2 * * *")
+    @Scheduled(cron = "0 0 2 * * ?")
     public void statsRefund() {
         try {
             List<Object[]> refundStatsGroupByChannelId = fssPaccountRefundRepo.findRefundStatsGroupByChannelId();

src/main/java/com/qtzl/alterSales/manager/service/AflVehicleStatusInfoServiceImpl.java

@@ -112,16 +112,13 @@ public class AflVehicleStatusInfoServiceImpl implements  AflVehicleStatusInfoSer
         BeanUtils.copyProperties(request,vehicleBlackListRequest);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
         vehicleBlackListRequest.setCreateTime(aflVehicleStatusInfo.getCreateTime().format(formatter));
-//        String token = sendCenterService.getToken(request.getUniqueKey());
-        String token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiLkvq_nh5oiLCJqdGkiOiI1MjAxMDE4NzAwMTAyMDEiLCJpYXQiOjE3MjEwNDEwNDF9.517NyFy7-RDQ8SvFsgI0z2OMuQQ57UpDPy55T5AyUy0";
-        log.info("操作状态名单-请求路网token为{}",token);
-        boolean implement = false;
+        boolean implement;
         try {
-            implement = fssBlackListManager.isSue(vehicleBlackListRequest, token);
+            implement = fssBlackListManager.isSue(vehicleBlackListRequest, sendCenterService.getToken(request.getUniqueKey()));
         } catch (ServiceHandleException e) {
             log.error("请求部中心状态名单接口失败，请求部中心状态名单参数：{}", JSON.toJSON(vehicleBlackListRequest));
             e.printStackTrace();
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请求部中心状态名单接口失败，"+ e.getMessage());
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException(e.getMessage());
         }
         if (implement){
             aflVehicleStatusInfo.setUpdateTime(LocalDateTime.now());

src/main/java/com/qtzl/alterSales/manager/service/center/PssSupServiceImpl.java

@@ -46,7 +46,6 @@ public class PssSupServiceImpl implements PssSupService {
     }
 
     @Override
-
     public <T extends SubBaseModel, K extends SubBaseModel> K pssSup(T req, String token, Class<K> var1)
             throws ManagerException {
         long inTime = System.currentTimeMillis();

src/main/resources/application-dev.yml

@@ -184,7 +184,19 @@ common:
 #  unique-key: AFL_NEW
 #  staff-id: shbotai001
 #  terminal-id: 999999999999
+#  # 用户账户体系
+#  account:
+#    url: https://etcxzuc.zgglyun.com/ucsp/
+#    channel-id: 52010101
+#    app-id: 52010101
+#    secret-key: r5O9Ue4D7X375WNi
+#    rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKg9bCs0sL9gqPlZ2JRfDSUkCWPGTw2NYsR7oWGECilpa3KVpAe4wdUFyafyMzjKkXp12nvWEqMnh7xRMPe1Ce4FaamrFgs9DyF4Wb2F2jI9zxDy50RVuWkCQbUZElG4sksVkPvER9NtDyiFat+OIEeHNx4FwpIgGb0WNTZsuMCbAgMBAAECgYAI35R3zAzIuPRnbdGxWIIPQ/69ErpAqeBcRuIm+fT/P95wDmxtfh5IwyOrqtVufWCiVWzzcx1L9abt8FgJ+I+ZbU52cKr/Qy7xxhvbr0Ozmmv6yu6yoGs/1USM7jdIDLUYN0RVoDZsFYaXPzvtSLLRZ9U4EYY+4hmu9qu98q9WgQJBAOpdfAkj6KeR2GyrKQf1u7UDe4DyjbAqHePlzeNkOY/JZon1wrhVF89rfBiTSmt3SYsFIO7qXmHBRzuEBz61d/ECQQC3xURWuDPmqsB7dTqqtqu+cmh0LFW2WWZrcIUdwMJrDrOjQ+7cFFsrg1NJ8jTZ3EGhIznUD1D2Na2mRIAWTW1LAkBlw6v9KAt435pTLUsGuswDwHxbNHcTnGYYNAvfhgB8j94nX4BqnABXv3tGDIbO/SAA7nwrYbcTyWIN1Ll0oEVxAkACPv371VqFCjc6Cw/BgGQO+tT9/oC5rtQKoiBuYam+pzpY13623+TRXlSJRdWRiBihQI33YoyJxdQugQ3Tt/SLAkEA1llvtXsFCaux7yWIhDRCCa6wNiWSVeYk3Pk1bDaoJDkp8mUY5N3cLTsOVytG4WV/E9l7Nkr3t3CpCpI3U7wQ7Q==
+#    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW4wvitZs5PCTz/vBT9VCm6b3E/zngp/us65PdssDqCPsDyyu5gq9Tze/MrrgkRezOq4CLmk6ip68S+zXL7lURlfU8dPLV+lKsTeKbnSgXstFscmCaNMyn1vlc3lr1b1zp4UL5kVG0KQ0wmpznb5+yXRd/Fujc681enbwHHD1FeQIDAQAB
+#    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJbjC+K1mzk8JPP+8FP1UKbpvcT/OeCn+6zrk92ywOoI+wPLK7mCr1PN78yuuCRF7M6rgIuaTqKnrxL7NcvuVRGV9Tx08tX6UqxN4pudKBey0WxyYJo0zKfW+VzeWvVvXOnhQvmRUbQpDTCanOdvn7JdF38W6NzrzV6dvAccPUV5AgMBAAECgYAQC3rDE966uluPmqeBtg9qgGaOoTlNW2+W1sI1jAGZoXTX1W4D3xK3zalXUakBKnJhE7mqnrEH+N7UHOR+mAxxlV/NPwx/Y+MPiE0BQW5vMqMx6Ljr8HyQ0sQSpYlsGVmBXmupPeZvMA9TfG9p32Y9dzSYQV51BF0Q4OoU0mWFhQJBANOiTvpzSHFcJUeppEIXIE6numBEmp6veq1oXyKEjE/Fzv/e7tMdT5Hz7C8qOl8CnEwKKXNFGThxu1qegIzYS6MCQQC2hKSRGWESltHWodJZNEgOhW/zz1jDBW9O7cQvjCXMVBzBsCrdXfkDvUPXOsFivzeWpt29jD2N4tjbowbtpDwzAkBic+d565eP5OYS6IBZnpiQ/sZdcozbtZbEhQF89Vyw37zkm7lOzRvvMiJ17pcpC/XaCgAud76722zlQ0daPmUxAkEAoGWtIf7FukpkmlSXwOEbOfe2TPM5NBoAmcKGGKr3RLvekbC52tSM0+ZuSiVOcfNNbM20LLGkHp7uqQZ6PjmI1QJAK6Tav7BeqcNQrfUcqmm55huDZT6e4dibrmILzPUrtmHDihIfZOOnuk+p4M/gbGgbZRZ08YZPuzknl6455pcYiQ==
+#    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoPWwrNLC/YKj5WdiUXw0lJAljxk8NjWLEe6FhhAopaWtylaQHuMHVBcmn8jM4ypF6ddp71hKjJ4e8UTD3tQnuBWmpqxYLPQ8heFm9hdoyPc8Q8udEVblpAkG1GRJRuLJLFZD7xEfTbQ8ohWrfjiBHhzceBcKSIBm9FjU2bLjAmwIDAQAB
+
 
+#
 center:
   private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIDbSyEYPq7SHr47LeJvvfk7KRFLYfIzgBponHhmkHnRIa2S4Yx207ufntFQsavmdWmRMIxJb6wWDEgl7IQ/8TIQNLTWhlTgoMNeXFPj3jUuK6e8c8cFa7RLcz+NqCs4Z4O0aSevJffmN3Tpi1ndLZ88RXx0cXGAX9h4riPvjR5PAgMBAAECgYAGVD8dcgZqKdHuwBNh4uEu47QBsHUwI01wfqDo3QjNovMHhoZjktaViaKQX2lKqzgrJkF/MoA0sKSLyqkSWd2r6BqZ8wrxquo73Buq2BzAP0GXnyitWf8rA1ix3iazSx8nd4Zt4/KFRObeRpyp/IxwUgcP4DgzGcPzDUDEqvXu+QJBAPi9Nyr960OES0Sz0XuOJVztYNWvo6p9S+4iHM9AV3WCEXZMFov/t+Oe1W8mYR+66uZarBDtc/+mui06XBhXdrUCQQCEnjd5rWp/7q3VdgNW7ahFhpPTGVnv7ND7cQJjYW362Sb0jv9LCijVfjSiUnk9dDnTYbc8TWihKp56Ops/Q39zAkBM1YX5Db5ieLcXXcRTujDoZ5sF5t9Thqixwm/LxUA+2BK0zAQa8r7G3QVo9B4EQyTUSyXjhLXUPpg76E8SZdIRAkByyuEKGenNwzQFSZmqbRzy0YKzf4Yx/7MFctS2YWdpcv4dQooI0kp2QkAdIXaAk1JafoK1V+vxVYrIEmK/aBWxAkEA9+4iSwoNKL0Gv14HCuVRZrUmpc7zfFTDNKzXstvlndUWym52b21xECmfqqGNvOpwMjez/jsTCx2q/XhHWfUFIQ==
   public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCA20shGD6u0h6+Oy3ib735OykRS2HyM4AaaJx4ZpB50SGtkuGMdtO7n57RULGr5nVpkTCMSW+sFgxIJeyEP/EyEDS01oZU4KDDXlxT4941LiunvHPHBWu0S3M/jagrOGeDtGknryX35jd06YtZ3S2fPEV8dHFxgF/YeK4j740eTwIDAQAB
@@ -199,7 +211,7 @@ center:
   staff-id: shbotai001
   terminal-id: 999999999999
 
-#  # 用户账户体系
+  #  # 用户账户体系
   account:
     url: https://uscp-dev.zgglyun.com/ucsp/
     app-id: 52010101
@@ -209,17 +221,6 @@ center:
     rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmmfVQqh5I9cqpklM4MON8SrT27JohzyGtVC3X0shwp0qXI7YoNJvtgS08GYtkwPiUu8inx/uvSUrX+uJeNo0lJ+aIY5Z36TSMewzY1GRLkXiVKctMP4f0Cy9wVf8uMXD2p0vuutRnXn2o1SchuHdQygNE+puLoASQrFBi8FikrQIDAQAB
     center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKaZ9VCqHkj1yqmSUzgw43xKtPbsmiHPIa1ULdfSyHCnSpcjtig0m+2BLTwZi2TA+JS7yKfH+69JStf64l42jSUn5ohjlnfpNIx7DNjUZEuReJUpy0w/h/QLL3BV/y4xcPanS+661GdefajVJyG4d1DKA0T6m4ugBJCsUGLwWKStAgMBAAECgYADLgNncjpuFGQ1VKnKSUNA6eDGqQu6DczWlOQ5Gc33OczWfKPV5Eco7c28t2oYgVxdOQZNOX0Swo3Z+HEIm6GZpi/3hV+TTml3nnozfqjCeFdek6z5vv9lpP1P4lnaPkYamUGK2K52HzQ0GBsSe1q/POhUVV2s9s+rMYgO927AKwJBAOTr6igEq3rCuTjEIeuOQXbzaFKTG2CIE8S+Tz2aaYkipTqbrbf+fRD0PlnitNJZD86eBLyHMGQMvojUABqEH7sCQQC6TuWXNHglkAG6mEQfML9HRaTVIMXfJAnPnAg6uol722Q2zIt2ecnl6RG7Dd1XqNxBg1r6tZBQImPRbrVIS4K3AkB8/Y6JMRuL2JwXMYevvKlj0D0KsQWGrGXWy24qnY+377G1kWDFkG8q/aC5pT3DiBtIXiEJ6upyBj9WKCKyV6eXAkAfvtfSJueeBua0g8N/yQ+etlg61KXCuuJNFNo2H5jTmPN/fuT4oBHt8gPKardfe29kXlx/QbbAYMu/YOzUz8ELAkEAg4UK6bhjZ0W97M9HqO/GBZMe0/PufScVFIYsQ8lde7oStY8N/TqkX5GdNr6ry1B7A94NaUmdaCOItawrmj3pZQ==
     center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCPvLOPKkhIqfwNsWjXJHDdnnlqtLfHjUCNaPKTCrfDlHln6y7LnncoEg8pwPg01YrPIFCFsUYKAFuq6jC6chtAJsew4LokL1hS7p5UKzA5ghXaT9f3ZyIc8BxzyluWSlWndpbJK7rYJiudoibc5b/NaGAcQpAJ8od/TS2+GYCqQIDAQAB
-  # 用户账户体系
-#  account:
-#    url: https://etcxzuc.zgglyun.com/ucsp/
-#    channel-id: 52010101
-#    app-id: 52010101
-#    secret-key: r5O9Ue4D7X375WNi
-#    rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKg9bCs0sL9gqPlZ2JRfDSUkCWPGTw2NYsR7oWGECilpa3KVpAe4wdUFyafyMzjKkXp12nvWEqMnh7xRMPe1Ce4FaamrFgs9DyF4Wb2F2jI9zxDy50RVuWkCQbUZElG4sksVkPvER9NtDyiFat+OIEeHNx4FwpIgGb0WNTZsuMCbAgMBAAECgYAI35R3zAzIuPRnbdGxWIIPQ/69ErpAqeBcRuIm+fT/P95wDmxtfh5IwyOrqtVufWCiVWzzcx1L9abt8FgJ+I+ZbU52cKr/Qy7xxhvbr0Ozmmv6yu6yoGs/1USM7jdIDLUYN0RVoDZsFYaXPzvtSLLRZ9U4EYY+4hmu9qu98q9WgQJBAOpdfAkj6KeR2GyrKQf1u7UDe4DyjbAqHePlzeNkOY/JZon1wrhVF89rfBiTSmt3SYsFIO7qXmHBRzuEBz61d/ECQQC3xURWuDPmqsB7dTqqtqu+cmh0LFW2WWZrcIUdwMJrDrOjQ+7cFFsrg1NJ8jTZ3EGhIznUD1D2Na2mRIAWTW1LAkBlw6v9KAt435pTLUsGuswDwHxbNHcTnGYYNAvfhgB8j94nX4BqnABXv3tGDIbO/SAA7nwrYbcTyWIN1Ll0oEVxAkACPv371VqFCjc6Cw/BgGQO+tT9/oC5rtQKoiBuYam+pzpY13623+TRXlSJRdWRiBihQI33YoyJxdQugQ3Tt/SLAkEA1llvtXsFCaux7yWIhDRCCa6wNiWSVeYk3Pk1bDaoJDkp8mUY5N3cLTsOVytG4WV/E9l7Nkr3t3CpCpI3U7wQ7Q==
-#    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW4wvitZs5PCTz/vBT9VCm6b3E/zngp/us65PdssDqCPsDyyu5gq9Tze/MrrgkRezOq4CLmk6ip68S+zXL7lURlfU8dPLV+lKsTeKbnSgXstFscmCaNMyn1vlc3lr1b1zp4UL5kVG0KQ0wmpznb5+yXRd/Fujc681enbwHHD1FeQIDAQAB
-#    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJbjC+K1mzk8JPP+8FP1UKbpvcT/OeCn+6zrk92ywOoI+wPLK7mCr1PN78yuuCRF7M6rgIuaTqKnrxL7NcvuVRGV9Tx08tX6UqxN4pudKBey0WxyYJo0zKfW+VzeWvVvXOnhQvmRUbQpDTCanOdvn7JdF38W6NzrzV6dvAccPUV5AgMBAAECgYAQC3rDE966uluPmqeBtg9qgGaOoTlNW2+W1sI1jAGZoXTX1W4D3xK3zalXUakBKnJhE7mqnrEH+N7UHOR+mAxxlV/NPwx/Y+MPiE0BQW5vMqMx6Ljr8HyQ0sQSpYlsGVmBXmupPeZvMA9TfG9p32Y9dzSYQV51BF0Q4OoU0mWFhQJBANOiTvpzSHFcJUeppEIXIE6numBEmp6veq1oXyKEjE/Fzv/e7tMdT5Hz7C8qOl8CnEwKKXNFGThxu1qegIzYS6MCQQC2hKSRGWESltHWodJZNEgOhW/zz1jDBW9O7cQvjCXMVBzBsCrdXfkDvUPXOsFivzeWpt29jD2N4tjbowbtpDwzAkBic+d565eP5OYS6IBZnpiQ/sZdcozbtZbEhQF89Vyw37zkm7lOzRvvMiJ17pcpC/XaCgAud76722zlQ0daPmUxAkEAoGWtIf7FukpkmlSXwOEbOfe2TPM5NBoAmcKGGKr3RLvekbC52tSM0+ZuSiVOcfNNbM20LLGkHp7uqQZ6PjmI1QJAK6Tav7BeqcNQrfUcqmm55huDZT6e4dibrmILzPUrtmHDihIfZOOnuk+p4M/gbGgbZRZ08YZPuzknl6455pcYiQ==
-#    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoPWwrNLC/YKj5WdiUXw0lJAljxk8NjWLEe6FhhAopaWtylaQHuMHVBcmn8jM4ypF6ddp71hKjJ4e8UTD3tQnuBWmpqxYLPQ8heFm9hdoyPc8Q8udEVblpAkG1GRJRuLJLFZD7xEfTbQ8ohWrfjiBHhzceBcKSIBm9FjU2bLjAmwIDAQAB
-#
 
 # 比亚迪配置
 byd: