|
|
@@ -82,10 +82,10 @@ public class GLPPWXGQueryUpdate {
|
|
|
*/
|
|
|
@Scheduled(fixedDelay = 1 * 60 * 1000)
|
|
|
public void wxgQueryUpdate() throws Exception {
|
|
|
- if (1==1){
|
|
|
+ /*if (1==1){
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+*/
|
|
|
WangdianWxgVos wvos = new WangdianWxgVos();
|
|
|
List<WorkerCert> updateList = new ArrayList<>();
|
|
|
List<WorkerCert> addList = new ArrayList<>();
|
|
|
@@ -124,7 +124,7 @@ public class GLPPWXGQueryUpdate {
|
|
|
.select(ItfTblWangdianWxgDownload::getWxgno,
|
|
|
ItfTblWangdianWxgDownload::getWdno,
|
|
|
ItfTblWangdianWxgDownload::getSfzen)
|
|
|
- .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用
|
|
|
+ //.eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用
|
|
|
.like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
|
|
|
|
|
|
//本地提取商户师傅网点信息
|
|
|
@@ -189,6 +189,10 @@ public class GLPPWXGQueryUpdate {
|
|
|
WorkerBrandAccount workerBrandAccount = null;
|
|
|
|
|
|
for (WorkerBrandAccount wba: wbarecs){
|
|
|
+ if (StringUtils.isEmpty(wba.getBrandWebsitNumber()) && StringUtils.isEmpty(wba.getBrandWorkerNumber()) &&
|
|
|
+ StringUtils.isEmpty(wxg.getWdno()) && StringUtils.isEmpty(wxg.getWxgno())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (wba.getBrandWebsitNumber().equals(wxg.getWdno())
|
|
|
&& wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
|
|
|
workerBrandAccount = wba;
|