feat: 零散bug变更

fs-admin/src/main/java/com/fs/his/controller/HzOMSErpApiController.java

@@ -105,6 +105,7 @@ public class HzOMSErpApiController {
      */
     @PostMapping("/ptorder/logisticsAdd")
     public HzOMSErpResponseVO logisticsAdd(String appkey, String timestamp, String datapakege, String sign) {
+        log.info("平台订单物流信息回传 appkey: {}, timestamp: {}, datapakege: {}, sign:{}", appkey, timestamp, datapakege,sign);
         HzOMSErpApiParam param = new HzOMSErpApiParam();
         param.setAppkey(appkey);
         param.setSign(sign);

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

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

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

@@ -66,7 +66,7 @@ public interface FsPackageMapper
      */
     public int deleteFsPackageByPackageIds(Long[] packageIds);
 
-    @Select("select package_id dictValue,package_name dictLabel from fs_package order by sort")
+    @Select("select package_id dictValue,package_name dictLabel from fs_package where status=1 order by sort")
     List<OptionsVO> selectAllPackageList();
     @Select({"<script> " +
             "select * from fs_package "+

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

@@ -222,9 +222,9 @@ public interface FsPrescribeMapper
             "OR drug_doctor_sign_url LIKE '%htj-1258038825.cos.ap-beijing.myqcloud.com%' \n" +
             "order by  prescribe_id desc ")
     List<FsPrescribe> selectFsPrescribeByPrescribeByimg();
-    @Select("select prescribe_code from fs_prescribe where store_order_id=#{orderId}")
+    @Select("select prescribe_code from fs_prescribe where store_order_id=#{orderId} limit 1")
     String selectFsPrescribeCodeByOrderId(String  orderId);
-    @Select("select prescribe_code from fs_prescribe where store_order_id=(select order_id from fs_store_order where order_code=#{businessCode} )")
+    @Select("select prescribe_code from fs_prescribe where store_order_id=(select order_id from fs_store_order where order_code=#{businessCode} limit 1)")
     String selectFsPrescribeCodeByOrderCode(String businessCode);
     @Select({"<script> " +
             "select count(1) 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 "+

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

@@ -240,12 +240,30 @@ public class HzOMSErpApiServiceImpl implements ErpApiService {
     /**
      * 获取解码后的JSONArray数据
      *
-     * @param s
+     * @param datapakege
      * @return
      */
-    public JSONArray getDecodeDataJSONArr(String s) {
-        JSONArray arr = JSONArray.parseArray(new String(Base64Utils.decode(s.getBytes(StandardCharsets.UTF_8))));
-        return arr;
+    public JSONArray getDecodeDataJSONArr(String datapakege) {
+        try {
+            // Base64解码
+            byte[] decodedBytes = Base64Utils.decode(datapakege.getBytes(StandardCharsets.UTF_8));
+            String jsonStr = new String(decodedBytes, StandardCharsets.UTF_8);
+
+            // 解析JSON数组
+            return JSONArray.parseArray(jsonStr);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            // 如果UTF-8解码失败，尝试其他编码
+            try {
+                byte[] decodedBytes = Base64Utils.decode(datapakege.getBytes(StandardCharsets.UTF_8));
+                String jsonStr = new String(decodedBytes, "GBK");
+                return JSONArray.parseArray(jsonStr);
+            } catch (Exception e2) {
+                e2.printStackTrace();
+                return null;
+            }
+        }
     }
 
 

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

@@ -173,7 +173,6 @@ public class FsStoreOrderController extends BaseController
     /**
      * 修改订单
      */
-
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FsStoreOrder fsStoreOrder)

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwLoginController.java

@@ -65,6 +65,8 @@ public class CourseQwLoginController extends AppBaseController {
     @PostMapping("/courseLogin")
     @Transactional
     public R courseLogin(@RequestBody LoginParam param) {
+        logger.info("小程序看课登录 {}",param);
+
         SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
         List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
         if (courseMaConfigs.isEmpty()){
@@ -135,7 +137,7 @@ public class CourseQwLoginController extends AppBaseController {
             map.put("user", user);
             map.put("isNew", isNewUser);
 
-            logger.info("zyp \n 【点播{}登录】：{}", logName, user.getUserId());
+            logger.info("【点播{}登录】：{}", logName, user.getUserId());
             return R.ok(map);
         } catch (WxErrorException e){
             logger.error("{}授权失败：{}", logName, e.getMessage(), e);