Merge remote-tracking branch 'origin/master'

src/main/java/com/mokamrp/privates/tast/pangu/UpdatePanguDataTask.java

@@ -35,7 +35,7 @@ public class UpdatePanguDataTask {
     @Autowired
     public PromoteQrcodePoolRecordService promoteQrcodePoolRecordService;
 
-    @Scheduled(cron = "0 */30 * * * ?")
+    @Scheduled(cron = "0 */1 * * * ?")
     public void execute() {
         System.out.println("[cronjob]:同步盘古个微码每日数据");
         List<PromoteQrcodePoolRecord> promoteQrcodePoolRecordList = promoteQrcodePoolRecordService.list();
@@ -89,8 +89,8 @@ public class UpdatePanguDataTask {
     public Boolean checkHasRecord(List<PromoteQrcodePoolRecord> promoteQrcodePoolRecordList,Integer promoteId,Integer custserviceId){
         Boolean hasRecord = false;
         for (PromoteQrcodePoolRecord promoteQrcodePoolRecord : promoteQrcodePoolRecordList) {
-            if (promoteQrcodePoolRecord.getPromoteId() == promoteId
-                    && promoteQrcodePoolRecord.getCustserviceId() == custserviceId) {
+            if (promoteQrcodePoolRecord.getPromoteId().equals(promoteId)
+                    && promoteQrcodePoolRecord.getCustserviceId().equals(custserviceId)) {
                 hasRecord = true;
             }
         }