Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -2796,22 +2796,28 @@ public class WeiXinCorpController {
                 }
                 wxOrder.setEditionId(orderDetail.getString("edition_id"));
                 wxOrder.setEditionName(orderDetail.getString("edition_name"));
-                wxOrder.setPrice(orderDetail.getDouble("price"));
+                wxOrder.setPrice(orderDetail.getInteger("price"));
                 wxOrder.setUserCount(orderDetail.getInteger("user_count"));
                 wxOrder.setOrderPeriod(orderDetail.getInteger("order_period"));
                 LocalDateTime order_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("order_time"),0,ZoneOffset.ofHours(8));
                 wxOrder.setOrderTime(order_time);
-                LocalDateTime paid_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("paid_time"),0,ZoneOffset.ofHours(8));
-                wxOrder.setPaidTime(paid_time);
-                LocalDateTime begin_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("begin_time"),0,ZoneOffset.ofHours(8));
-                wxOrder.setBeginTime(begin_time);
-                LocalDateTime end_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("end_time"),0,ZoneOffset.ofHours(8));
-                wxOrder.setEndTime(end_time);
+                if (orderDetail.getLong("paid_time")!=0){
+                    LocalDateTime paid_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("paid_time"),0,ZoneOffset.ofHours(8));
+                    wxOrder.setPaidTime(paid_time);
+                }
+                if (orderDetail.getLong("begin_time")!=0){
+                    LocalDateTime begin_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("begin_time"),0,ZoneOffset.ofHours(8));
+                    wxOrder.setBeginTime(begin_time);
+                }
+                if (orderDetail.getLong("end_time")!=0){
+                    LocalDateTime end_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("end_time"),0,ZoneOffset.ofHours(8));
+                    wxOrder.setEndTime(end_time);
+                }
                 wxOrder.setOrderFrom(orderDetail.getInteger("order_from"));
                 wxOrder.setOperatorCorpid(orderDetail.getString("operator_corpid"));
-                wxOrder.setServiceShareAmount(orderDetail.getString("service_share_amount"));
-                wxOrder.setPlatformShareAmount(orderDetail.getString("platform_share_amount"));
-                wxOrder.setDealerShareAmount(orderDetail.getString("dealer_share_amount"));
+                wxOrder.setServiceShareAmount(orderDetail.getInteger("service_share_amount"));
+                wxOrder.setPlatformShareAmount(orderDetail.getInteger("platform_share_amount"));
+                wxOrder.setDealerShareAmount(orderDetail.getInteger("dealer_share_amount"));
                 if (orderDetail.containsKey("dealer_corp_info")){
                     JSONObject dealer_corp_info = orderDetail.getJSONObject("dealer_corp_info");
                     wxOrder.setDealerCorpid(dealer_corp_info.getString("corpid"));