Merge branch 'dev' into test

src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java

@@ -74,6 +74,7 @@ public class ThirdUploadSetController {
                     thrOrderUploadBustypesEntity.setOrderStatus(3);
                     thrOrderUploadBustypesEntity.setUpdateTime(new Date());
                     thrOrderUploadBustypesEntity.setCreateTime(new Date());
+                    thrOrderUploadBustypesEntity.setId(null);
                     thrOrderUploadBustypesEntity.setOrderSource(Arrays.asList("2"));
                     thrOrderUploadBustypesService.save(thrOrderUploadBustypesEntity);
                 }

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1951,15 +1951,15 @@ public class HeartService {
             }
         }
 
-        //更新发票信息
+//        //更新发票信息
-        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
+//            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
-            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+//                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
+//                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
-                }
+//                }
-            }
+//            }
-        }
+//        }
     }
 
     @Resource
@@ -1995,14 +1995,14 @@ public class HeartService {
         }
 
         //更新发票信息
-        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
+//            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
-            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+//                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
+//                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
-                }
+//                }
-            }
+//            }
-        }
+//        }
     }
 
 

src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -472,7 +472,7 @@
                 #{sfwwjbz},
                 #{syqsfxyjxmj},
                 #{qtxxdwzlj},
-                #{mjfs}，#{categoryName})
+                #{mjfs},#{categoryName})
     </insert>