change

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -823,7 +823,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     userInformationCollectionMapper.updateFsUserInformationCollection(collectionUser);
 
                     //信息采集关联套餐包且意向金额小于等于0处理为已支付的订单
-                    if (collection.getIsPackage() == 1 &&  !(collection.getAmount().compareTo(new BigDecimal(0))==1)) {
+                    if (collection.getIsPackage() == 1 &&  !(collection.getAmount().compareTo(new BigDecimal(0))==1) && collection.getPayType() == 2) {
                         FsPackageOrder mapOrder = new FsPackageOrder();
                         mapOrder.setOrderId(order.getOrderId());
                         //计算订单

fs-service/src/main/java/com/fs/his/vo/FsDoctorArticleUVO.java

@@ -9,7 +9,6 @@ import java.util.Date;
 
 @Data
 public class FsDoctorArticleUVO implements Serializable {
-    private static final long serialVersionUID = 1L;
 
 
     /** ID */

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -721,7 +721,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 log.info("同步用户id:{}信息采集进度:{}",param.getUserId(),schedule);
                 log.info("当前采集表isPackage数值:{}",collection.getIsPackage());
                 if (collection.getIsPackage() == 1 ) {
-                    if(collection.getAmount().compareTo(new BigDecimal(0))==1) {
+                    if(collection.getAmount().compareTo(new BigDecimal(0))==1 || collection.getPayType() == 1){
                         //带套餐包的 "待支付"节点
                         schedule.setCurrentStep(PrescriptionTaskStepEnum.WAITING_UN_PAY.getCode());
                         log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_UN_PAY.getDesc(),schedule.getCollectionId());