结算明细字段映射调整

src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java

@@ -131,6 +131,11 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setBookOrgCode2(lyOrderFlightRecord.getPassengerDepartment())  //出行人组织架构信息2
                 .setBookOrgCode3(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息3
                 .setOfflineCcomyCode(lyOrderFlightRecord.getPassengerCostCenter())    //成本中心
+ /*               .setOrderStatus()    //结算状态
+                .setExpenseOrderAmount()    //订单金额
+                .setSettleOrderFlag()    //订单对账状态
+                .setPayAmount()    //支付金额
+*/
         ;
     }
 
@@ -187,6 +192,11 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setBookOrgCode2("")  //入住人组织架构信息2
                 .setBookOrgCode3("") //入住人组织架构信息3
                 .setOfflineCcomyCode(lyOrderHotelRecord.getPassengerCostCenter())    //成本中心
+/*               .setOrderStatus()    //结算状态
+                .setExpenseOrderAmount()    //订单金额
+                .setSettleOrderFlag()    //订单对账状态
+                .setPayAmount()    //支付金额
+*/
         ;
     }
 
@@ -234,14 +244,20 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setBookOrgCode2("")//出行人组织架构信息2
                 .setBookOrgCode3("")//出行人组织架构信息3
                 .setOfflineCcomyCode(lyOrderTrainRecord.getPassengerCostCenter())//成本中心
-                .setTravelUserBirthday("")//生日
+/*               .setOrderStatus()    //结算状态
+               .setExpenseOrderAmount()    //订单金额
+               .setSettleOrderFlag()    //订单对账状态
+               .setPayAmount()    //支付金额
+*/
+
+/*                .setTravelUserBirthday("")//生日
                 .setTravelUserPhone("") //出行人手机号
                 .setTravelUserSex("")//"性别：0保密不展示 1男 2女"
                 .setTravelUserType("") //"乘客类型：成人(ADULT) 儿童(CHILDREN) 婴儿(BABY)"
                 .setPassportNo("")//乘客证件号
                 .setPassportType("")//乘客证件类型
                 .setTrainTime("")//发车时间 yyyy - MM - dd HH:mm:ss
-                .setYxId("")//影像比对ID
+                .setYxId("")//影像比对ID*/
         ;
     }
 
@@ -288,9 +304,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setPaymentType(String.valueOf(getPaymentType(lyOrderCarRecord.getPayType())))   //"付款方式0：公司统付 1：个人付 2：混付"
                 .setOfflineCcomyCode(lyOrderCarRecord.getPassengerDepartment())   //成本中心
                 .setOrderSource(lyOrderCarRecord.getBookingPlat())  //预订来源：线上/线下
-//                .setORDER_AMOUNT()   //订单金额
+/*                .setExpenseOrderAmount()   //订单金额
-//                .setSETTLE_ORDER_FLAG()   //订单对账状态
+                .setSettleOrderFlag()   //订单对账状态
-//                .setpayAmount()// 支付金额
+                .setPayAmount()// 支付金额*/
+
         ;
     }
 

src/main/java/com/chint/infrastructure/echo_framework/manager/EventManager.java

@@ -66,20 +66,26 @@ public class EventManager implements ApplicationContextAware, BeanNameAware, Ini
         }
     }
 
+
     private void scanAndRegister(Object bean) {
-        Method[] methods = null;
+        Method[] methods = getTargetClassMethods(bean);
-        //判断是何种类型的代理,使得动态代理的自定义注解不会失效
+        processAnnotation(methods, bean);
-        if (AopUtils.isJdkDynamicProxy(bean)) {
-            Object singletonTarget = AopProxyUtils.getSingletonTarget(bean);
-            if (singletonTarget != null) {
-                methods = singletonTarget.getClass().getDeclaredMethods();
     }
-        } else if (AopUtils.isCglibProxy(bean)) {
+
-            methods = bean.getClass().getSuperclass().getDeclaredMethods();
+    private Method[] getTargetClassMethods(Object bean) {
-        } else {
+        //判断是何种类型的代理,获取动态代理后的原类的自定义注解，使其不会失效。
-            methods = bean.getClass().getDeclaredMethods();
+        if (AopUtils.isCglibProxy(bean)) {
+            return bean.getClass().getSuperclass().getDeclaredMethods();
+        } else if (AopUtils.isJdkDynamicProxy(bean)) {
+            Object target = AopProxyUtils.getSingletonTarget(bean);
+            if (target != null) {
+                return target.getClass().getDeclaredMethods();
             }
-        if (methods != null) {
+        }
+        return bean.getClass().getDeclaredMethods();
+    }
+
+    private void processAnnotation(Method[] methods, Object bean) {
         for (Method method : methods) {
             if (method.isAnnotationPresent(ListenTo.class)) {
                 ListenTo listenTo = method.getAnnotation(ListenTo.class);
@@ -93,7 +99,6 @@ public class EventManager implements ApplicationContextAware, BeanNameAware, Ini
             }
         }
     }
-    }
 
     private static List<ResultContainer> processCommand(Command command, Object... args) {
         List<MethodContainer> containers = listenerMethods.getOrDefault(command.getCommandName(), Collections.emptyList());