Merge remote-tracking branch 'origin/master' into xinghong-dev

service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java

@@ -100,6 +100,9 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
         } else if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {  //微信公众号支付
             paramObj.put("primeRate", "6");
             paramObj.put("remark", "线上公众号支付");
+        }else{ // 默认 小程序支付
+            paramObj.put("primeRate", "5");
+            paramObj.put("remark", "其他支付");
         }
 
         //添加单元信息

service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java

@@ -140,6 +140,9 @@ public class MachineAddOwnerRepairAdapt extends DatabusAdaptImpl {
             staffAppAuthDto.setStaffId(userDto.getUserId());
             staffAppAuthDto.setAppType("WECHAT");
             List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
+            if(staffAppAuthDtos == null || staffAppAuthDtos.size()<1){
+                continue;
+            }
             String openId = staffAppAuthDtos.get(0).getOpenId();
             Data data = new Data();
             PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();