add:小黄车跳转商城小程序

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

@@ -5,9 +5,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.his.domain.FsChineseMedicine;
 import com.fs.his.domain.FsFollowTemp;
 import com.fs.his.param.FsPackageParam;
@@ -18,6 +25,7 @@ import com.fs.his.vo.FsPackageChooseVO;
 import com.fs.his.vo.FsPackageExcelVO;
 import com.fs.his.vo.FsPackageListVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.wxwork.utils.WxWorkHttpUtilNew;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -57,6 +65,24 @@ public class FsPackageController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsPackageParam fsPackage)
     {
+
+        if (fsPackage != null && fsPackage.getIsShow() == 2 && CloudHostUtils.hasCloudHostName("金牛明医")){
+            //康年商城套餐
+            String urlPath = "https://admin.kangniantangyiyao.top/prod-api/store/store/storeProductPackage/list";
+            Map<String, Object>  map = new HashMap<>();
+            map.put("pageNum",fsPackage.getPageNum());
+            map.put("pageSize",fsPackage.getPageSize());
+            map.put("title",fsPackage.getPackageName());
+            map.put("status",1);
+            String response = WxWorkHttpUtilNew.get(urlPath, map);
+            if (StringUtils.isNotBlank(response)){
+                TableDataInfo tableDataInfo = JSON.parseObject(response, TableDataInfo.class);
+                if (tableDataInfo.getCode() == 200){
+                    return tableDataInfo;
+                }
+            }
+            return new TableDataInfo();
+        }
         startPage();
         List<FsPackageListVO> list = fsPackageService.selectFsPackageListVO(fsPackage);
         return getDataTable(list);

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -65,6 +65,7 @@ import com.fs.his.service.IFsUserIntegralLogsService;
 import com.fs.his.service.IFsUserService;
 import com.fs.his.service.IFsUserWxService;
 import com.fs.his.utils.ConfigUtil;
+import com.fs.his.vo.FsPackageAndTypeListVO;
 import com.fs.his.vo.FsPackageListVO;
 import com.fs.his.vo.OptionsVO;
 import com.fs.im.service.OpenIMService;
@@ -2963,17 +2964,30 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                 throw new RuntimeException(e);
             }
             if (jsonNode.isArray()) {
+                List<FsPackageAndTypeListVO> fsPackageListVOS = new ArrayList<>();
                 for (JsonNode node : jsonNode) {
-                    String packageId = node.path("packageId").asText();
-                    if (StringUtils.isNotEmpty(packageId)) {
-                        packageIds.add(packageId);
+                    String type = node.path("type").asText();
+                    if (StringUtils.isNotBlank(type) && "3".equals(type)) {
+                        FsPackageAndTypeListVO fsPackageListVO = new FsPackageAndTypeListVO();
+                        fsPackageListVO.setPackageId(node.path("packageId").asLong());
+                        fsPackageListVO.setPackageName(node.path("packageName").asText());
+                        fsPackageListVO.setSecondName(node.path("secondName").asText());
+                        fsPackageListVO.setTotalPrice(new BigDecimal(node.path("totalPrice").asText()));
+                        fsPackageListVO.setImgUrl(node.path("imgUrl").asText());
+                        fsPackageListVO.setType(3);
+                        fsPackageListVOS.add(fsPackageListVO);
+                    } else {
+                        String packageId = node.path("packageId").asText();
+                        if (StringUtils.isNotEmpty(packageId)) {
+                            packageIds.add(packageId);
+                        }
                     }
                 }
-                List<FsPackageListVO> fsPackageListVOS = new ArrayList<>();
                 if (!packageIds.isEmpty()) {
-                    fsPackageListVOS = fsPackageMapper.selectFsPackagesByIds(packageIds);
-                }else {
-                    fsPackageListVOS = new ArrayList<>();
+                    List<FsPackageAndTypeListVO>  fsPackageList= fsPackageMapper.selectFsPackagesByIds(packageIds);
+                    if (!fsPackageList.isEmpty()) {
+                        fsPackageListVOS.addAll(fsPackageList);
+                    }
                 }
                 vo.setTreatmentPackage(fsPackageListVOS);
             }

fs-service/src/main/java/com/fs/course/vo/FsUserCourseVideoH5DVO.java

@@ -1,6 +1,7 @@
 package com.fs.course.vo;
 
 import com.fs.common.core.domain.BaseEntity;
+import com.fs.his.vo.FsPackageAndTypeListVO;
 import com.fs.his.vo.FsPackageListVO;
 import lombok.Data;
 
@@ -63,6 +64,6 @@ public class FsUserCourseVideoH5DVO extends BaseEntity
     /**
      * 疗法包套餐
      */
-    private List<FsPackageListVO> treatmentPackage;
+    private List<FsPackageAndTypeListVO> treatmentPackage;
 
 }

fs-service/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoDetailsVO.java

@@ -1,5 +1,6 @@
 package com.fs.course.vo.newfs;
 
+import com.fs.his.vo.FsPackageAndTypeListVO;
 import com.fs.his.vo.FsPackageListVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -43,7 +44,7 @@ public class FsUserCourseVideoDetailsVO {
     /**
      * 疗法包套餐
      */
-    private List<FsPackageListVO> treatmentPackage;
+    private List<FsPackageAndTypeListVO> treatmentPackage;
 
     /**
      * 疗法包展示

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

@@ -167,5 +167,5 @@ public interface FsPackageMapper
      */
     List<FsGoodsVO> getFsGoodsVOListByIds(@Param("packageIds") List<Long> packageIds);
 
-    List<FsPackageListVO> selectFsPackagesByIds(@Param("packageIdList") List<String> packageIds);
+    List<FsPackageAndTypeListVO> selectFsPackagesByIds(@Param("packageIdList") List<String> packageIds);
 }

fs-service/src/main/java/com/fs/his/param/FsPackageParam.java

@@ -26,4 +26,6 @@ public class FsPackageParam implements Serializable {
     private Integer isShow;
     private Long solarTerm;
     private String appId; //所属小程序
+    private Integer pageNum;
+    private Integer pageSize;
 }

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

@@ -0,0 +1,15 @@
+package com.fs.his.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FsPackageAndTypeListVO extends  FsPackageListVO {
+
+    private Integer type; //3为康年商城
+}

fs-service/src/main/java/com/fs/store/config/StoreConfig.java

@@ -23,5 +23,6 @@ public class StoreConfig implements Serializable {
     private String refundAddress;
     private Integer auditSwitch; // 订单审核开关
     private BigDecimal payPostage; // 货到付款邮费
+    private String jumpStoreAppId; // 跳转商城小程序appid
 
 }

fs-service/src/main/resources/mapper/his/FsPackageMapper.xml

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
-    <select id="selectFsPackagesByIds" resultType="com.fs.his.vo.FsPackageListVO">
+    <select id="selectFsPackagesByIds" resultType="com.fs.his.vo.FsPackageAndTypeListVO">
         select
         *
         from fs_package

fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -53,6 +53,7 @@ import com.fs.im.service.IImService;
 import com.fs.qw.domain.FsAppContactWay;
 import com.fs.qw.service.IFsAppContactWayService;
 import com.fs.qw.service.IQwAppContactWayService;
+import com.fs.store.config.StoreConfig;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 import com.fs.system.service.ISysConfigService;
@@ -679,4 +680,12 @@ public class CommonController {
 		return  R.ok().put("isSmsVerification",0);
 
 	}
+
+	@ApiOperation("跳转商城小程序")
+	@GetMapping("/getJumpStoreAppId")
+	public R getJumpStoreAppId() {
+		String json=configService.selectConfigByKey("his.store");
+		StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
+		return R.ok(config.getJumpStoreAppId());
+	}
 }