Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929

fs-admin/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-jnmy-test
+    active: dev
 #    active: druid-hdt
 #    active: druid-yzt
 #    active: druid-sxjz

fs-company/src/main/java/com/fs/company/controller/store/FsPackageOrderController.java

@@ -171,16 +171,12 @@ public class FsPackageOrderController extends BaseController
     @Log(title = "查看套餐电话", businessType = BusinessType.GRANT)
     public R getPhone(@PathVariable("orderId") Long orderId)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser.getUser().getUserType().equals("00")){
-            FsPackageOrderVO order = fsPackageOrderService.selectFsPackageOrderByOrderIdVO(orderId);
-            String userPhone = order.getPhone();
-            if (StringUtils.isNotBlank(userPhone) && userPhone.trim().length() > 11) {
-                userPhone = PhoneUtil.decryptPhone(userPhone);
-            }
-            return R.ok().put("userPhone",userPhone);
+        FsPackageOrderVO order = fsPackageOrderService.selectFsPackageOrderByOrderIdVO(orderId);
+        String userPhone = order.getPhone();
+        if (StringUtils.isNotBlank(userPhone) && userPhone.trim().length() > 11) {
+            userPhone = PhoneUtil.decryptPhone(userPhone);
         }
-        return R.error("无权查看");
+        return R.ok().put("userPhone",userPhone);
     }
 
     /**

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -242,19 +242,12 @@ public class FsStoreOrderController extends BaseController
     @Log(title = "查看电话", businessType = BusinessType.GRANT)
     public R getPhone(@PathVariable("orderId") Long orderId)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser.getUser().getUserType().equals("00")){
-            FsStoreOrderVO order = fsStoreOrderService.selectFsStoreOrderByOrderIdVO(orderId);
-            if (order.getUserPhone().length()>11){
-
-                return R.ok().put("userPhone",PhoneUtil.decryptPhone(order.getUserPhone()));
-            }else {
-                return R.ok().put("userPhone",order.getUserPhone());
-            }
-
-
+        FsStoreOrderVO order = fsStoreOrderService.selectFsStoreOrderByOrderIdVO(orderId);
+        if (order.getUserPhone().length()>11){
+            return R.ok().put("userPhone",PhoneUtil.decryptPhone(order.getUserPhone()));
+        }else {
+            return R.ok().put("userPhone",order.getUserPhone());
         }
-        return R.error("无权查看");
     }
 
     /**

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderOfflineScrmController.java

@@ -110,13 +110,9 @@ public class FsStoreOrderOfflineScrmController extends BaseController
     @Log(title = "查看电话", businessType = BusinessType.GRANT)
     public R getPhone(@PathVariable("orderId") Long orderId)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if (loginUser.getUser().getUserType().equals("00")){
-            FsStoreOrderOfflineListVO order=fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
-            String userPhone = order.getMobile();
-            return R.ok().put("userPhone",userPhone);
-        }
-        return R.error("无权查看");
+        FsStoreOrderOfflineListVO order=fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
+        String userPhone = order.getMobile();
+        return R.ok().put("userPhone",userPhone);
     }
 
     /**

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -236,13 +236,9 @@ public class FsStoreOrderScrmController extends BaseController
     @Log(title = "查看电话", businessType = BusinessType.GRANT)
     public R getPhone(@PathVariable("id") Long id)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if (loginUser.getUser().getUserType().equals("00")){
-            FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-            String userPhone = order.getUserPhone();
-            return R.ok().put("userPhone",userPhone);
-        }
-        return R.error("无权查看");
+        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
+        String userPhone = order.getUserPhone();
+        return R.ok().put("userPhone",userPhone);
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrder:express')")

fs-doctor-app/src/main/java/com/fs/app/controller/FsPrescribeController.java

@@ -180,7 +180,10 @@ public class FsPrescribeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsPrescribe fsPrescribe)
     {
-        return toAjax(fsPrescribeService.updateFsPrescribe(fsPrescribe));
+        int i = fsPrescribeService.updateFsPrescribe(fsPrescribe);
+        fsPrescribeService.delUrl(fsPrescribe.getPrescribeId());
+        exportTaskService.updateFsExportTaskByPrescribeId(fsPrescribe.getPrescribeId());
+        return toAjax(i);
     }
 
     /**

fs-service/src/main/java/com/fs/his/mapper/FsExportTaskMapper.java

@@ -64,4 +64,7 @@ public interface FsExportTaskMapper
     Integer isExportType1(Long userId);
     @Select("select count(1) from fs_export_task where sys_type=2 and `status`=0 and company_user_id=#{userId}")
     Integer isExportType2(Long userId);
+
+    @Select("update prescription_task_record set execute_status=0 where prescribe_id=#{id}")
+    void updateFsExportTaskByPrescribeId(Long id);
 }

fs-service/src/main/java/com/fs/his/mapper/FsPrescribeMapper.java

@@ -9,6 +9,7 @@ import com.fs.his.param.FsPrescribeParam;
 import com.fs.his.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 处方Mapper接口
@@ -153,7 +154,7 @@ public interface FsPrescribeMapper
 
 
 
-    @Select("select so.*,ffff.doctor_name prescribeDoctorName, us.nick_name ,dc.doctor_name,dp.doctor_name doctor_drug_name,fso.order_code,fso.`status` order_status,fse.store_name FROM fs_prescribe so  LEFT JOIN fs_user us ON us.user_id=so.user_id LEFT JOIN fs_doctor dc ON dc.doctor_id = so.doctor_id LEFT JOIN fs_doctor dp ON dp.doctor_id =so.drug_doctor_id LEFT JOIN fs_store_order fso ON fso.order_id = so.store_order_id LEFT JOIN fs_store fse ON fse.store_id = so.store_id  LEFT JOIN fs_doctor ffff ON ffff.doctor_id=so.prescribe_doctor_id  where so.prescribe_id=#{prescribeId}")
+    @Select("select so.*,dc.sign_url url,ffff.doctor_name prescribeDoctorName, us.nick_name ,dc.doctor_name,dp.doctor_name doctor_drug_name,fso.order_code,fso.`status` order_status,fse.store_name FROM fs_prescribe so  LEFT JOIN fs_user us ON us.user_id=so.user_id LEFT JOIN fs_doctor dc ON dc.doctor_id = so.doctor_id LEFT JOIN fs_doctor dp ON dp.doctor_id =so.drug_doctor_id LEFT JOIN fs_store_order fso ON fso.order_id = so.store_order_id LEFT JOIN fs_store fse ON fse.store_id = so.store_id  LEFT JOIN fs_doctor ffff ON ffff.doctor_id=so.prescribe_doctor_id  where so.prescribe_id=#{prescribeId}")
     FsPrescribeVO selectFsPrescribeByPrescribeIdVO(Long prescribeId);
     @Select({"<script> " +
             "select so.*,us.nick_name,dc.doctor_name,dp.doctor_name doctor_drug_name,fso.order_code,fso.`status` order_status,fse.store_name,fio.order_sn FROM fs_prescribe so  LEFT JOIN fs_user us ON us.user_id=so.user_id LEFT JOIN fs_doctor dc ON dc.doctor_id = so.doctor_id LEFT JOIN fs_doctor dp ON dp.doctor_id =so.drug_doctor_id LEFT JOIN fs_store_order fso ON fso.order_id = so.store_order_id LEFT JOIN fs_store fse ON fse.store_id = so.store_id LEFT JOIN fs_inquiry_order fio ON fio.order_id=so.inquiry_order_id "+
@@ -281,4 +282,6 @@ public interface FsPrescribeMapper
     List<Long> selectFsPrescribeByPrescribeIdByOrderType();
 
     List<FsPrescribeListVO> selectFsPrescribeListVOWithConfirm(FsPrescribeParam fsPrescribe);
+    @Update("UPDATE fs_prescribe SET prescribe_img_url = NULL WHERE prescribe_id = #{prescribeId}")
+    void delUrl(Long prescribeId);
 }

fs-service/src/main/java/com/fs/his/service/IFsExportTaskService.java

@@ -72,4 +72,7 @@ public interface IFsExportTaskService
     void exportStorePaymentData(FsStorePaymentParam fsStorePayment);
 
     Integer isExportType2(Long userId);
+
+    void updateFsExportTaskByPrescribeId(Long id);
+
 }

fs-service/src/main/java/com/fs/his/service/IFsPrescribeService.java

@@ -111,4 +111,5 @@ public interface IFsPrescribeService
 
     void confirmPrescribe(FsPrescribeParam param);
 
+    void delUrl(Long prescribeId);
 }

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

@@ -278,4 +278,9 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
     public Integer isExportType2(Long userId) {
          return fsExportTaskMapper.isExportType2(userId);
     }
+
+    @Override
+    public void updateFsExportTaskByPrescribeId(Long id) {
+         fsExportTaskMapper.updateFsExportTaskByPrescribeId(id);
+    }
 }

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

@@ -509,7 +509,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             o.setPatientGender(f.getPatientGender());
             o.setPatientAge(f.getPatientAge());
             o.setOutpatientId(f.getPrescribeCode());
-            o.setUrl(f.getPrescribeDoctorSignUrl());
+            o.setUrl(f.getUrl());
             o.setDrugDoctorUrl(f.getDrugDoctorSignUrl());
             if (order != null) {
                 o.setBedId(order.getDeptName());
@@ -1054,4 +1054,10 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         prescriptionTaskRecordMapper.insert(record);
     }
 
+    @Override
+    public void delUrl(Long prescribeId) {
+        fsPrescribeMapper.delUrl(prescribeId);
+
+    }
+
 }

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

@@ -412,7 +412,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new IllegalArgumentException("数据库表fs_store_order中订单不存在");
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),1))) {
+        if (StringUtils.isBlank(dbOrder.getExtendOrderId())) {
             log.info("修改订单地址不满足推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
             throw new RuntimeException("修改订单地址不满足推送到ERP条件");
         }

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

@@ -318,8 +318,8 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
             try {
                 BufferedImage doctorSign = downloadSignatureImage(param.getUrl());
                 if (doctorSign != null) {
-                    Image scaledSign = doctorSign.getScaledInstance(100, 60, Image.SCALE_SMOOTH);
-                    pen.drawImage(scaledSign, 202, 1381, null);
+                    Image scaledSign = doctorSign.getScaledInstance(120, 80, Image.SCALE_SMOOTH);
+                    pen.drawImage(scaledSign, 202, 1342, null);
                 }
             } catch (Exception e) {
                 log.error("加载医师签名失败: {}", param.getUrl(), e);
@@ -329,10 +329,10 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
         // 药师签名
         if (StringUtils.isNotBlank(param.getDrugDoctorUrl())) {
             try {
-                BufferedImage pharmacistSign = downloadSignatureImage(param.getDrugDoctorUrl());
+                BufferedImage pharmacistSign = downloadSignatureImage("https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/ysy/20251021/be7ef2dda6d94b6c97c9b41bdb3a9cb8.png");
                 if (pharmacistSign != null) {
-                    Image scaledSign = pharmacistSign.getScaledInstance(100, 60, Image.SCALE_SMOOTH);
-                    pen.drawImage(scaledSign, 1076, 1556, null);
+                    Image scaledSign = pharmacistSign.getScaledInstance(120, 80, Image.SCALE_SMOOTH);
+                    pen.drawImage(scaledSign, 1076, 1528, null);
                 }
             } catch (Exception e) {
                 log.error("加载药师签名失败: {}", param.getDrugDoctorUrl(), e);

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

@@ -126,7 +126,7 @@ public class FsPrescribeVO implements Serializable {
     private Long drugDoctorId;
     @Excel(name = "0颗粒1膏方")
     private Integer recipeType;
-
+    private String url;
     /** 状态 0未开 1已开 */
     @Excel(name = "状态 0未开 1已开")
     private Integer status;

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

@@ -102,6 +102,9 @@ public class FsStoreOrderExportVO implements Serializable
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date deliverySendTime;
 
     /** 支付方式 */
     @Excel(name = "支付方式" ,dictType = "sys_store_pay_type")

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

@@ -448,9 +448,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             return;
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),1))) {
+        if (StringUtils.isBlank(dbOrder.getExtendOrderId())) {
             log.info("不满足修改订单地址推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
-            throw new RuntimeException("只支持待发货修改地址！");
+            throw new RuntimeException("不满足修改订单地址推送到ERP条件！");
         }
         // 3. 构造用于ERP推送的订单对象：订单地址用传入的新值
         if (StrUtil.isBlank(partialOrder.getUserAddress())){

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

@@ -11,6 +11,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.common.BeanCopyUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
@@ -56,7 +57,7 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * 用户信息采集Service业务层处理
- * 
+ *
  * @author fs
  * @date 2025-10-14
  */
@@ -104,7 +105,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 查询用户信息采集
-     * 
+     *
      * @param id 用户信息采集主键
      * @return 用户信息采集
      */
@@ -116,7 +117,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 查询用户信息采集列表
-     * 
+     *
      * @param fsUserInformationCollection 用户信息采集
      * @return 用户信息采集
      */
@@ -128,7 +129,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 新增用户信息采集
-     * 
+     *
      * @param param 用户信息采集
      * @return 结果
      */
@@ -143,7 +144,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 修改用户信息采集
-     * 
+     *
      * @param param 用户信息采集
      * @return 结果
      */
@@ -167,7 +168,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 批量删除用户信息采集
-     * 
+     *
      * @param ids 需要删除的用户信息采集主键
      * @return 结果
      */
@@ -179,7 +180,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     /**
      * 删除用户信息采集信息
-     * 
+     *
      * @param id 用户信息采集主键
      * @return 结果
      */
@@ -340,15 +341,26 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             map.setDoctorConfirm(1);
             //插入生成处方签定时任务数据
             if(fsUserInformationCollection.getPackageOrderCode() != null) {
-                FsStoreOrder fsStoreOrder = storeOrderService.selectFsStoreOrderByOrderCode(fsUserInformationCollection.getPackageOrderCode());
-                if (fsStoreOrder != null && fsStoreOrder.getIsPay() == 1) {
-                    if (fsStoreOrder.getPrescribeId() != null) {
-                        FsPrescribeParam fsPrescribeParam = new FsPrescribeParam();
-                        fsPrescribeParam.setPrescribeId(fsStoreOrder.getPrescribeId());
-                        prescribeService.confirmPrescribe(fsPrescribeParam);
+                //套餐包订单
+                FsPackageOrder fsPackageOrder = packageOrderMapper.selectByOderCode(fsUserInformationCollection.getPackageOrderCode());
+                if (fsPackageOrder != null && fsPackageOrder.getIsPay() == 1) {
+                    //套餐包信息
+                    FsPackage fsPackage = JSON.parseObject(fsPackageOrder.getPackageJson(), FsPackage.class);
+
+                    //套餐包为药品生成处方信息
+                    if(fsPackage != null && (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2)) {
+                        FsStoreOrder fsStoreOrder = storeOrderService.selectFsStoreOrderByOrderCode(fsUserInformationCollection.getPackageOrderCode());
+                        if (fsStoreOrder != null && fsStoreOrder.getIsPay() == 1 ) {
+                            if (fsStoreOrder.getPrescribeId() != null) {
+                                FsPrescribeParam fsPrescribeParam = new FsPrescribeParam();
+                                fsPrescribeParam.setPrescribeId(fsStoreOrder.getPrescribeId());
+                                prescribeService.confirmPrescribe(fsPrescribeParam);
+                            }
+                        } else {
+                            throw new CustomException("生成处方信息中......");
+                        }
                     }
                 }
-
             }
         } else {
             //没有关联套餐包医生确认清空所有状态
@@ -382,9 +394,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
         if (collection != null) {
 
-            if (!Objects.equals(collection.getUserId(), userId)) {
-                return vo;
-            }
+//            if (!Objects.equals(collection.getUserId(), userId)) {
+//                return vo;
+//            }
             if (collection.getIsPackage() == 1) {
                 vo.setPackageId(collection.getPackageId());
                 vo.setPayType(collection.getPayType());
@@ -438,6 +450,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     @Override
     @Transactional
     public R userConfirm(CollectionInfoConfirmParam param) {
+
         if (param.getId() == null) {
             return R.error("参数错误");
         }
@@ -450,6 +463,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 return R.error("用户已确认");
             }
         }
+        if (!Objects.equals(collection.getUserId(), param.getUserId())) {
+            return R.error("用户信息不匹配,无法确认");
+        }
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(param.getId());
         map.setUserConfirm(1);
@@ -460,7 +476,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             //第一次确认
             if (collection.getStatus() == 1) {
                 map.setStatus(2);
-            } else if (collection.getStatus() == 2) {
+            }
+            else if (collection.getStatus() == 2) {
                 //清空订单号
                 fsUserInformationCollectionMapper.collectionOderCodeNULL(collection.getId());
                 map.setStatus(1);

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -118,6 +118,10 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date deliverySendTime;
+
     /** 支付方式 */
     @Excel(name = "支付方式", dictType = "store_pay_type")
     private String payType;

fs-service/src/main/java/com/fs/huifuPay/service/impl/HuiFuServiceImpl.java

@@ -369,22 +369,22 @@ public class HuiFuServiceImpl implements HuiFuService {
 
 
     public MerConfig getMerConfig(){
-//        SysConfigMapper sysConfigMapper= SpringUtils.getBean(SysConfigMapper.class);
-//        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("his.pay");
-//        FsPayConfig fsPayConfig = new Gson().fromJson(sysConfig.getConfigValue(), FsPayConfig.class);
-
-        FsPayConfig fsPayConfig = new FsPayConfig();
-        fsPayConfig.setAppId("wx646836bf3f7d4227");
-        fsPayConfig.setHfProductId("KAZX");
-        fsPayConfig.setHfSysId("6666000175632107");
-        fsPayConfig.setHuifuId("6666000175632107");
+        SysConfigMapper sysConfigMapper= SpringUtils.getBean(SysConfigMapper.class);
+        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("his.pay");
+        FsPayConfig fsPayConfig = new Gson().fromJson(sysConfig.getConfigValue(), FsPayConfig.class);
+
+//        FsPayConfig fsPayConfig = new FsPayConfig();
+//        fsPayConfig.setAppId("wx646836bf3f7d4227");
+//        fsPayConfig.setHfProductId("KAZX");
+//        fsPayConfig.setHfSysId("6666000175632107");
+//        fsPayConfig.setHuifuId("6666000175632107");
         //fsPayConfig.setHfRsaPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCijLcYLMJEe16TS6BtEG9hUezZyYvp2qgpPVGWaaBbb6lud89ILMUC7jyTWufCo2fUQ0nJzYhVlNeMzmGFtg/zFwhkjJIkuCOW+/Koy1ow66Rom8/sNQLb82szHoeklbv17AnD7WJis7cGyy1+3E6jzfaPOB7PTzidK6KyfCWDByOt0JcGe3+6+9+loQFbFRXJ2RpWPQeN72n9FVtSKSvgkGtJNUzh/qBwMPN6ol6xcU/Z2o1sYrRfKC4tcMqccRi/DvvZFJPVlN+YqkJ6lhgAmJg7eZ2fhIgrmzqc96UKp2YUNm+1v8XHCflD9Wv94E6D2JgL4VbF4Zyf+fKYuR7pAgMBAAECggEAfy5UL6ENmuFgHSVF7y+1xdKA2+IbC60ed63XgTVB12jli15Im3MT7ngSg0TUIvERUv4W5MNgkX10rWHo4eKSViPGWE24JuzAQ+j7cuAwwCgPKh4HMAxGIWwyivuvK7JQL1kwRtEccpekc7dS8HhVO0rySBqj2JZmeGrk0HvcKciSWuMjhjT4dJUwSntD07REV6rVjrpQXuvmY40vH88uvHLdH1IcjmJs2yJRNawUNtd+8FvpOCjami7zpB+er+AQ6S2fvpljNqfE5Kadm3MvzBngDdMS3xRvMHfjCifVwFpLP0rLDP6cSn6PJWbkNYQVZi12w8+wb5f7AVlaKXnfdQKBgQDh7VC5+MOqfcUr9h/n2vhFFhQOaGAZCOBc65n8VBj9aRht8ViXFvRrIRmM+QvUbV9/7taFbtAnZXIzu+12T4vnlZv9DTsy6kKloV5923xZ4CpzIVG8crlwJz1wdALeO6M485RtRLjz6nlNKn2m2VJ1d5XFBDhIz5rWUzagPwwpwwKBgQC4L8Eyu6Yn/zQmv8l6rfAsEfUJzfYtojf1PerPYilARtgFuD20cppcOP5oAk2TTX3qaz0Y9atCfL2z2qxtrgKtw2etfhDBmT6l6+pg04SLuyTrVeZ5dxXHt+LRLJnvBbGgnvAM6rSRKdHXT0gfqiRIMw2qIUtndgRr4RK5hqcd4wKBgBYBFh620t/VFhIdC6h6VDnuV4+7rLhje+6w57OCwVhVFxMGMZmtm6qfc6yeSP+sk2OTcINYcp+TqtbNE+i1AKxSjvnLgxuHY2xcViat7OOYCKpj8WEIT3VT7RD5y5m3d0NBvhASZG0lRiE05T4N5pEYT5b7vTuiNLNxMV3UJiwfAoGBAIb2/1QEqwmN+RIX4TSTNnWkpvELSkRAJU8Akwpp/J5MC0mNqzGJ9NB1Nv7SCTRSSV04PaoHgvoSXBPpvgYUx4O6t0MrKG4ktAJzL+jJtcuKU9Bavqrs9znE5mCulRHQE0wGixJ7/dqNUWW7g7coPrPlLTMoeI+UrEK8x7LJF7ZPAoGALHvtu6zzWVeCdELIPUTersVQrH1R3yZuf6rgubg4XFw3meFcd4W8BvXm4EKGRZxdiyZvCtKlkV9u110Rx3RNSbZCOb3MClmkcow8vPIhmyGWIGymAIxr9JcD0p6HogzPvbjRsLh1nFg/+95OL2E353Bp4/oPIgYIfnYNUfD+0gA=");
         //fsPayConfig.setHfRsaPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjbkiiy2ewzuPsM5uZbAFMJOBWCRRQ2RtH7Dbr9Evbow6IEyvGoen8XKpiuXzapeps3b2eogETHVFQtLooqRHpVRppFKtU1AHZXA7C6wPocfMldJbTykDCowyJwOSYEaFPBjr9cw6dQcBJMIEHj0YWjBPR1dPVzf+y4sUohbrkS/FANBpp24j+Mu0qEqh8TuVuKlvig7jbmXJiJkAmUJ+Tb3Caj20fFTen6juPd3zR/KM3twki06wZZbb4KyCiM/NwozEqJ9PkWSs6rG7aW+BEfzlo3m1a7MlL0vpKNR3f0lbywq09rFAwtA7R2lssWwLMma4LOqtMMqo3yZdv4vObQIDAQAB");
         //fsPayConfig.setHfRsaPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCijLcYLMJEe16TS6BtEG9hUezZyYvp2qgpPVGWaaBbb6lud89ILMUC7jyTWufCo2fUQ0nJzYhVlNeMzmGFtg/zFwhkjJIkuCOW+/Koy1ow66Rom8/sNQLb82szHoeklbv17AnD7WJis7cGyy1+3E6jzfaPOB7PTzidK6KyfCWDByOt0JcGe3+6+9+loQFbFRXJ2RpWPQeN72n9FVtSKSvgkGtJNUzh/qBwMPN6ol6xcU/Z2o1sYrRfKC4tcMqccRi/DvvZFJPVlN+YqkJ6lhgAmJg7eZ2fhIgrmzqc96UKp2YUNm+1v8XHCflD9Wv94E6D2JgL4VbF4Zyf+fKYuR7pAgMBAAECggEAfy5UL6ENmuFgHSVF7y+1xdKA2+IbC60ed63XgTVB12jli15Im3MT7ngSg0TUIvERUv4W5MNgkX10rWHo4eKSViPGWE24JuzAQ+j7cuAwwCgPKh4HMAxGIWwyivuvK7JQL1kwRtEccpekc7dS8HhVO0rySBqj2JZmeGrk0HvcKciSWuMjhjT4dJUwSntD07REV6rVjrpQXuvmY40vH88uvHLdH1IcjmJs2yJRNawUNtd+8FvpOCjami7zpB+er+AQ6S2fvpljNqfE5Kadm3MvzBngDdMS3xRvMHfjCifVwFpLP0rLDP6cSn6PJWbkNYQVZi12w8+wb5f7AVlaKXnfdQKBgQDh7VC5+MOqfcUr9h/n2vhFFhQOaGAZCOBc65n8VBj9aRht8ViXFvRrIRmM+QvUbV9/7taFbtAnZXIzu+12T4vnlZv9DTsy6kKloV5923xZ4CpzIVG8crlwJz1wdALeO6M485RtRLjz6nlNKn2m2VJ1d5XFBDhIz5rWUzagPwwpwwKBgQC4L8Eyu6Yn/zQmv8l6rfAsEfUJzfYtojf1PerPYilARtgFuD20cppcOP5oAk2TTX3qaz0Y9atCfL2z2qxtrgKtw2etfhDBmT6l6+pg04SLuyTrVeZ5dxXHt+LRLJnvBbGgnvAM6rSRKdHXT0gfqiRIMw2qIUtndgRr4RK5hqcd4wKBgBYBFh620t/VFhIdC6h6VDnuV4+7rLhje+6w57OCwVhVFxMGMZmtm6qfc6yeSP+sk2OTcINYcp+TqtbNE+i1AKxSjvnLgxuHY2xcViat7OOYCKpj8WEIT3VT7RD5y5m3d0NBvhASZG0lRiE05T4N5pEYT5b7vTuiNLNxMV3UJiwfAoGBAIb2/1QEqwmN+RIX4TSTNnWkpvELSkRAJU8Akwpp/J5MC0mNqzGJ9NB1Nv7SCTRSSV04PaoHgvoSXBPpvgYUx4O6t0MrKG4ktAJzL+jJtcuKU9Bavqrs9znE5mCulRHQE0wGixJ7/dqNUWW7g7coPrPlLTMoeI+UrEK8x7LJF7ZPAoGALHvtu6zzWVeCdELIPUTersVQrH1R3yZuf6rgubg4XFw3meFcd4W8BvXm4EKGRZxdiyZvCtKlkV9u110Rx3RNSbZCOb3MClmkcow8vPIhmyGWIGymAIxr9JcD0p6HogzPvbjRsLh1nFg/+95OL2E353Bp4/oPIgYIfnYNUfD+0gA=");
         //fsPayConfig.setHfRsaPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjbkiiy2ewzuPsM5uZbAFMJOBWCRRQ2RtH7Dbr9Evbow6IEyvGoen8XKpiuXzapeps3b2eogETHVFQtLooqRHpVRppFKtU1AHZXA7C6wPocfMldJbTykDCowyJwOSYEaFPBjr9cw6dQcBJMIEHj0YWjBPR1dPVzf+y4sUohbrkS/FANBpp24j+Mu0qEqh8TuVuKlvig7jbmXJiJkAmUJ+Tb3Caj20fFTen6juPd3zR/KM3twki06wZZbb4KyCiM/NwozEqJ9PkWSs6rG7aW+BEfzlo3m1a7MlL0vpKNR3f0lbywq09rFAwtA7R2lssWwLMma4LOqtMMqo3yZdv4vObQIDAQAB");
         //fsPayConfig.setHfPayOnlineNotifyUrl("https://userapp.ysya.top/app/hfPay/payNotifyUrl");
-        fsPayConfig.setHfRsaPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCOLOsfdbmB5qe7HTwbpxNQW0+5O6+im/7x+ZOBCf30FftYYRvnzbcsbvdBZa7745d7OgMB9Drd6vWah5Xp4uGf+tZOwGMHm6C8lphswJp3d1vPARuZulw4WSaIm+b8M2zEg+IMZiGhFC+H6fjtQm2jBz+Szvfa+MPwOzdJNcczpv56dujjz3G8Pf5aizZWjz5ovuWSSwdnmP8OAPBYhQaaBF4JyrIv5s89Vm+xIVlvvMcTo8uNf7HbKgUR27fjxyTtcJAlZUc/7XuBxNXTknxP1taiJU4XXeNpsPnLq31KwCsacPFZ5/QHvgkaDFjmImWaHUESMAFT/bkZvbV+PJvXAgMBAAECggEAYenRa3MZ9Loy3Yw+rxSbGoYoG3tdc/FW3LJywTVubcENvknye+uSsMkjAyjSH6sX0ceb9qaKO/bqeifSOKcFl7WaDdY03TJyui5EfvEN8CSFV8R9i5tqk2viO8aShzGrQJNLBBr6IgLS0RlzU4KiGtqND7/1thoIZtOBOawNqiXarFQo7i5DpsV6cZhw5Pk/JP5eQMhcVnyDmjYSKIcbCtkOmYHgxjXt79JnJBrwhHQ3gmdFO43XtuH+LPtg7tsvLetwIX1s5KdGJqXuDwFa/grFpTVa/oHZ0vebdHyNKn2WFbXEuGZP+GsudOEMRYIpyyPIJEzHmlXJs5SbYeLgUQKBgQDHEPUfOiqFg2APYtSFH751tPRRpqI0RZf9D3c/OEUXBCAEbVFocIPVexk+HNS3MXkzxTHS+ULRSCnmaSMKIcjJgX8ekatwNKzUbnXT9R4w2hSqp0vI1o9pNASe5dLQAKnp9WzyXAYeRxflQ+wb/d4xfwn4oqxti66TMBkhYpPY7QKBgQC21pYNZVADjQWKMVvbqqvHec22iTCpqmwJtD90Ze3DLI0SjJnPSeSRkMb71wNQYITH6pdFqw5KpdgxuQlefA6is3mSQ+Ovk+bCG84Ii5b2SAVUfUnknJA4OnPKn9TJs0C8BtpN7wQDKI2wTw5GGqdsDu2ly9ZpZRv/b/oM0/yDUwKBgAIINUhdUqPMRIXDr4GwYkRXVYsj1VINR9DogIIfs+zZOO5yozsasu3R9N8CclVwZtlVcP3DV6BFSVA10IrA74jHDqIkQIjDsOP2QLOqM+WxxDY9wPNK5Wnggw+QLwe6igF+ZN9QeyuB9Ed92wIqJEODFXn5RyNTIrQT8J27oOC9AoGBAIdedRZR7l3SqUlZphMLV8eGrQH6rObRYNAGffymAtVAROp44uAQa4RC1rBazv9Rlr2VOI7CSQCHrXuS7hbgbs2TZ+0dCpRSQsVwZKj7ALgzNo8JfA4gxL58uIJKt/bmGoWb5UFSN3xHKDBjN8Q7s71TiCv6sTKzQ3lp5I5e3VQ1AoGANS1iuylO0EAm5EmbzOLgHDa+qptG9pkG3eiEFO0IDXKc1Kd6haJkQJH6phePg1L6X7X/zEPuVW9EuUUWmICxRcVLlqGfuj4CAq/x8JEbpizMyD8hM+8DgnwWOHc3OY8OxgooNwlvf+zn5rLY3LkpTnPJL/AdRyQRlKaO7Jqqpc0=");
-        fsPayConfig.setHfRsaPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnv5W7Fwgxe6VIEAmT0scdRAv7ZjzmaRLIcsUuwwI1/1HDDfBk3oyYsPHTpsP5BpdceKfcNkowmLE4RDnTHjdGe6qWFCp/R18oKiASp/4kqeA1NYycP3Vu4AQZKMJCpqmWEwYBUl6Js033MQd575C10zdzTexvA0lggMFoM5toI13cvPD58dYqGFzmNUsv5IfUfdRmj0ul4etFpgWYSpHPWlWMV2TpR+HhrDf8/hqqYgUn1lsvFlLzeC7LyhpahgXmXv6FdJFEAQ95EsvD8OpgzRyPxpkBwHh5ogsldi+9sWYDnT2/w/fuGVELpXO3otJ1JuROyuOPx23A2aoTBnTTQIDAQAB");
+//        fsPayConfig.setHfRsaPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCOLOsfdbmB5qe7HTwbpxNQW0+5O6+im/7x+ZOBCf30FftYYRvnzbcsbvdBZa7745d7OgMB9Drd6vWah5Xp4uGf+tZOwGMHm6C8lphswJp3d1vPARuZulw4WSaIm+b8M2zEg+IMZiGhFC+H6fjtQm2jBz+Szvfa+MPwOzdJNcczpv56dujjz3G8Pf5aizZWjz5ovuWSSwdnmP8OAPBYhQaaBF4JyrIv5s89Vm+xIVlvvMcTo8uNf7HbKgUR27fjxyTtcJAlZUc/7XuBxNXTknxP1taiJU4XXeNpsPnLq31KwCsacPFZ5/QHvgkaDFjmImWaHUESMAFT/bkZvbV+PJvXAgMBAAECggEAYenRa3MZ9Loy3Yw+rxSbGoYoG3tdc/FW3LJywTVubcENvknye+uSsMkjAyjSH6sX0ceb9qaKO/bqeifSOKcFl7WaDdY03TJyui5EfvEN8CSFV8R9i5tqk2viO8aShzGrQJNLBBr6IgLS0RlzU4KiGtqND7/1thoIZtOBOawNqiXarFQo7i5DpsV6cZhw5Pk/JP5eQMhcVnyDmjYSKIcbCtkOmYHgxjXt79JnJBrwhHQ3gmdFO43XtuH+LPtg7tsvLetwIX1s5KdGJqXuDwFa/grFpTVa/oHZ0vebdHyNKn2WFbXEuGZP+GsudOEMRYIpyyPIJEzHmlXJs5SbYeLgUQKBgQDHEPUfOiqFg2APYtSFH751tPRRpqI0RZf9D3c/OEUXBCAEbVFocIPVexk+HNS3MXkzxTHS+ULRSCnmaSMKIcjJgX8ekatwNKzUbnXT9R4w2hSqp0vI1o9pNASe5dLQAKnp9WzyXAYeRxflQ+wb/d4xfwn4oqxti66TMBkhYpPY7QKBgQC21pYNZVADjQWKMVvbqqvHec22iTCpqmwJtD90Ze3DLI0SjJnPSeSRkMb71wNQYITH6pdFqw5KpdgxuQlefA6is3mSQ+Ovk+bCG84Ii5b2SAVUfUnknJA4OnPKn9TJs0C8BtpN7wQDKI2wTw5GGqdsDu2ly9ZpZRv/b/oM0/yDUwKBgAIINUhdUqPMRIXDr4GwYkRXVYsj1VINR9DogIIfs+zZOO5yozsasu3R9N8CclVwZtlVcP3DV6BFSVA10IrA74jHDqIkQIjDsOP2QLOqM+WxxDY9wPNK5Wnggw+QLwe6igF+ZN9QeyuB9Ed92wIqJEODFXn5RyNTIrQT8J27oOC9AoGBAIdedRZR7l3SqUlZphMLV8eGrQH6rObRYNAGffymAtVAROp44uAQa4RC1rBazv9Rlr2VOI7CSQCHrXuS7hbgbs2TZ+0dCpRSQsVwZKj7ALgzNo8JfA4gxL58uIJKt/bmGoWb5UFSN3xHKDBjN8Q7s71TiCv6sTKzQ3lp5I5e3VQ1AoGANS1iuylO0EAm5EmbzOLgHDa+qptG9pkG3eiEFO0IDXKc1Kd6haJkQJH6phePg1L6X7X/zEPuVW9EuUUWmICxRcVLlqGfuj4CAq/x8JEbpizMyD8hM+8DgnwWOHc3OY8OxgooNwlvf+zn5rLY3LkpTnPJL/AdRyQRlKaO7Jqqpc0=");
+//        fsPayConfig.setHfRsaPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnv5W7Fwgxe6VIEAmT0scdRAv7ZjzmaRLIcsUuwwI1/1HDDfBk3oyYsPHTpsP5BpdceKfcNkowmLE4RDnTHjdGe6qWFCp/R18oKiASp/4kqeA1NYycP3Vu4AQZKMJCpqmWEwYBUl6Js033MQd575C10zdzTexvA0lggMFoM5toI13cvPD58dYqGFzmNUsv5IfUfdRmj0ul4etFpgWYSpHPWlWMV2TpR+HhrDf8/hqqYgUn1lsvFlLzeC7LyhpahgXmXv6FdJFEAQ95EsvD8OpgzRyPxpkBwHh5ogsldi+9sWYDnT2/w/fuGVELpXO3otJ1JuROyuOPx23A2aoTBnTTQIDAQAB");
 
         config=fsPayConfig;
         MerConfig merConfig = new MerConfig();