add

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -192,7 +192,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public void insertData(String downloadTaskNo, List<DetailDownloadData> detailDownloadDatas,
 						   int downloadTaskType, String pgguid,Map<String, List<SysDict>> sysDictRefDLMap,Long id)
 			throws Exception {
@@ -236,7 +235,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 	}
 
 
-	public void process(String downloadTaskNo, int downloadTaskType, String pgguid, Map<String, List<SysDict>> sysDictRefDLMap) {
+	@Transactional(rollbackFor = Exception.class)
+	public void process(String downloadTaskNo, int downloadTaskType, String pgguid, Map<String, List<SysDict>> sysDictRefDLMap) throws Exception {
 		if (downloadTaskType == 2201){
 			// 安装工单采集数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt
 			// 安装工单主表的order_base pgguid OK
@@ -284,7 +284,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		}
 	}
 
-	public void processRepair(String downloadTaskNo, int downloadTaskType, String pgguid, Map<String, List<SysDict>> sysDictRefDLMap) {
+	public void processRepair(String downloadTaskNo, int downloadTaskType, String pgguid, Map<String, List<SysDict>> sysDictRefDLMap) throws Exception {
 		if (downloadTaskType == 2201){
 			// 安装工单采集数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt
 			processOrderInstallDetailJ(downloadTaskNo, pgguid);
@@ -1371,16 +1371,20 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		odfs.add(a);
 	}
 
-	private int getOrderInstallDetailS(List<OrderInstallDetail> oids, int count, OrderBase order, ItfTblAzWgmxSyktDownload item) {
+	private int getOrderInstallDetailS(List<OrderInstallDetail> oids, int count, OrderBase order, ItfTblAzWgmxSyktDownload item) throws Exception {
 		WebsitSH websitSH;
 		OrderInstallDetail a = new OrderInstallDetail();
 		OrderPar req = new OrderPar();
 		req.setSynReqId(item.getSynReqId());
 		a= azWgmxSyktDownloadMapper.getAzsyktInfo(req);
+		if (a==null){
+			throw new Exception("查询数据失败");
+		}
 		a.setId(IdWorker.getIdStr());
 
 		WorderInfo worderInfo = publicService.getWorkerInfo(order.getWorkerId(), item.getCzwd(), order.getGroupCompanyId());
 		a.setWxgid(worderInfo.getBrandWorkerNumber());
+
 		if (item.getWcsj() !=null){
 			a.setFirstTime(item.getWcsj());
 		} else {
@@ -1443,7 +1447,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		return count;
 	}
 
-	public void processOrderInstallDetailS(String downloadTaskNo, String pgguid) {
+	public void processOrderInstallDetailS(String downloadTaskNo, String pgguid) throws Exception {
 		List<OrderInstallDetail> oids = new ArrayList<>();
 		List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
 		int count = 1;
@@ -1464,13 +1468,17 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				// 生成采集明细数据
 				count = getOrderInstallDetailS(oids, count, order, item);
 
+				log.info("测试a pgguid: {}",pgguid);
 				// 增加处理三级从表的下载任务
 				getItfGreeToFaDownloadTaskListS(its, item);
+				log.info("测试b pgguid: {}",pgguid);
 			}
 			orderInstallDetailService.saveBatch(oids);
 			oids.clear();
+			log.info("测试c pgguid: {}",pgguid);
 			itfGreeToFaDownloadTaskListService.saveBatch(its);
 			its.clear();
+			log.info("测试d pgguid: {}",pgguid);
 		}
 
 		// 修改同步状态

src/main/resources/mapper/AzWgmxSyktDownloadMapper.xml

@@ -15,7 +15,8 @@
                p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,p.id as pgmxid,
                a.czren as operator_account,a.czren as operator_name,a.czwd as operator_websit_id,b.worker_id as main_worker_id,
                b.worker_name as main_worker_name,a.cjren as create_by,a.cjdt as create_time,a.last_modified_by as update_by,
-               case a.installenvironment when 1 then 'YES' else 'NO' end as is_special,a.flbz as assist_remark,IFNULL(a.wcsj,a.czsj) as first_time
+               case a.installenvironment when 1 then 'YES' else 'NO' end as is_special,a.flbz as assist_remark,
+               IFNULL(a.wcsj,a.czsj) as first_time,'' as buy_certificate_picture,'' as after_buy_certificate_picture
         from itf_tbl_az_wgmx_sykt_download a
                  join order_base b on a.pgguid = b.pgguid
                  join order_product p on a.pgguid = p.pgguid and b.id = p.order_base_id and a.pgmxid = p.pgmxid