feat：套餐包订单-回调接口调整

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

@@ -517,7 +517,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                         }
                     } else if ("appPay".equals(payment.getPayMode()) && "wx".equals(payment.getPayTypeCode())) {
                         MerchantAppConfig merchantAppConfig = merchantAppConfigMapper.selectMerchantAppConfigById(payment.getMerConfigId());
-                        FsPayConfig fsPayConfig = com.alibaba.fastjson.JSON.parseObject(merchantAppConfig.getDataJson(), FsPayConfig.class);
+                        FsPayConfig fsPayConfig = JSON.parseObject(merchantAppConfig.getDataJson(), FsPayConfig.class);
 
                         // 处理微信退款
                         WxPayService wxPayService = getWxPayService(fsPayConfig);
@@ -1774,12 +1774,18 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         BeanUtils.copyProperties(patient,dto);
         FsPackagePatientDTO patJson = JSON.parseObject(packageOrder.getPatientJson(),FsPackagePatientDTO.class);
         long currentTimeMillis = System.currentTimeMillis();
-        long ageInMillis = currentTimeMillis - patJson.getBirthday();
+
+        long ageInMillis = 0;
+        if(packageOrder.getPatientJson()!=null){
+            ageInMillis = currentTimeMillis - patJson.getBirthday();
+        }
         long ageInSeconds = ageInMillis / 1000;
         long ageInYears = ageInSeconds / (365 * 24 * 3600);
         dto.setAge(ageInYears+"");
         // 使用 SimpleDateFormat 格式化日期对象
-        dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));
+        if(patient != null && patient.getBirthday() != null){
+            dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));
+        }
         FsInquiryOrder order=new FsInquiryOrder();
         order.setOrderSn(packageOrder.getOrderSn());
         order.setOrderType(2);