xuhy
2026-01-06 cb9f4ff7b0c8d2751060eacdb86a4d7e78a016c3
管理后台配置
9个文件已修改
93 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
@@ -140,7 +140,7 @@
    /**
     * 获取AI检测页面
     */
    @ApiOperation(value = "获取AI检测页面",notes = "设备类型 deviceType: android ios")
    @ApiOperation(value = "获取AI检测页面[1229]",notes = "设备类型 deviceType: android ios")
    @GetMapping(value = "/getXiMaAiDetection")
    public R<JSONObject> getXiMaAiDetection(@RequestParam String deviceType) {
        String userId = tokenService.getLoginUserApplet().getUserId();
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
@@ -41,6 +41,14 @@
    @TableField("goods_source")
    private Integer goodsSource;
    @ApiModelProperty(value = "封面")
    @TableField("cover")
    private String cover;
    @ApiModelProperty(value = "详情图")
    @TableField("detail_pictures")
    private String detailPictures;
    @ApiModelProperty(value = "商品名称")
    @TableField("goods_name")
    @Excel(name = "*商品名称")
@@ -86,7 +94,6 @@
    @Excel(name = "*预警库存")
    private Integer warningInventory;
    @ApiModelProperty(value = "商品类型id")
    @TableField("type_id")
    private String typeId;
@@ -126,12 +133,9 @@
    @TableField(exist = false)
    private String packingUnitName;
    @ApiModelProperty(value = "商品规格")
    @TableField("goods_spec")
    private String goodsSpec;
    @ApiModelProperty(value = "商品售价")
    @TableField("sales_amount")
@@ -140,8 +144,6 @@
    @ApiModelProperty(value = "包装单位,单位id")
    @TableField("packing_unit_id")
    private String packingUnitId;
    @ApiModelProperty(value = "使用说明")
    @TableField("instructions_use")
@@ -158,6 +160,10 @@
    @TableField("platform_commission_price")
    private BigDecimal platformCommissionPrice;
    @ApiModelProperty(value = "建议零售价")
    @TableField("retail_price")
    private BigDecimal retailPrice;
    @ApiModelProperty(value = "1启用 2禁用")
    private Integer state;
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
@@ -90,4 +90,8 @@
    @TableField("clinic_id")
    private String clinicId;
    @ApiModelProperty(value = "已使用免费查看报告次数")
    @TableField("use_ai_free_count")
    private Integer useAiFreeCount;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
@@ -59,6 +59,10 @@
    @TableField("expected_duration")
    private Integer expectedDuration;
    @ApiModelProperty(value = "内容类型 1=直播 2=视频")
    @TableField("content_type")
    private Integer contentType;
    @ApiModelProperty(value = "直播方式 1=视频直播 2=语音直播")
    @TableField("live_way")
    private Integer liveWay;
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java
@@ -51,6 +51,18 @@
    @TableField("ai_price")
    private BigDecimal aiPrice;
    @ApiModelProperty(value = "ai免费次数")
    @TableField("ai_free_count")
    private Integer aiFreeCount;
    @ApiModelProperty(value = "ai月卡费用")
    @TableField("ai_month_price")
    private BigDecimal aiMonthPrice;
    @ApiModelProperty(value = "ai计费说明")
    @TableField("ai_instructions")
    private String aiInstructions;
    @ApiModelProperty(value = "自动收货时间")
    @TableField("delivery_time")
    private Integer deliveryTime;
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -7,7 +7,8 @@
        <id column="id" property="id"/>
        <result column="supplier_clinic_id" property="supplierClinicId"/>
        <result column="goods_source" property="goodsSource"/>
        <result column="clinic_id" property="clinicId"/>
        <result column="cover" property="cover"/>
        <result column="detail_pictures" property="detailPictures"/>
        <result column="goods_name" property="goodsName"/>
        <result column="goods_id_code" property="goodsIdCode"/>
        <result column="quasi_number" property="quasiNumber"/>
@@ -28,6 +29,7 @@
        <result column="side_effect" property="sideEffect"/>
        <result column="clinic_purchase_price" property="clinicPurchasePrice"/>
        <result column="platform_commission_price" property="platformCommissionPrice"/>
        <result column="retail_price" property="retailPrice"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="create_by" property="createBy"/>
@@ -37,21 +39,12 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id
        , supplier_clinic_id, goods_source, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec, packing_spec, type_id, goods_yards, maintenance_interval,maintenance_interval_unit, low_purchase_quantity, low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use, side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by,`state`, update_by, disabled,
          simplified_code,
dosage_form,
usage_classification,
product_brand,
place_of_origin,
ingredient,
trait,
indication,
taboo,
precautions,
interaction,
storage,supplier_name
        id, supplier_clinic_id, goods_source, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec,
        packing_spec, type_id, goods_yards, maintenance_interval,maintenance_interval_unit, low_purchase_quantity,
        low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use,
        side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by,`state`,
        update_by, disabled,simplified_code,dosage_form,usage_classification,product_brand,place_of_origin,ingredient,
        trait,indication,taboo,precautions,interaction,storage,supplier_name,cover,detail_pictures,retail_price
    </sql>
@@ -75,6 +68,7 @@
        t1.content_state,
        t1.content_remark,
        t1.state_remark,
        t1.cover,t1.detail_pictures,t1.retail_price,
        case t1.goods_source
        when 1 then t2.supplier_name
        when 2 then t1.supplier_name
@@ -348,6 +342,7 @@
        t1.interaction,
        t1.content,t1.content_state,
        t1.storage,t1.state_remark,
        t1.cover,t1.detail_pictures,t1.retail_price,
        t2.supplier_name
        from t_erp_goods t1 left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id and t1.goods_source =1
        where t1.disabled = 0 and t1.goods_source =1
@@ -421,7 +416,8 @@
               t1.create_time,
               t1.update_time,
               t1.create_id,
               t3.type_name
               t3.type_name,
                t1.cover,t1.detail_pictures,t1.retail_price
        FROM t_erp_goods t1
         LEFT JOIN t_crm_supplier t2 ON t1.supplier_clinic_id = t2.id
        left join t_erp_goods_type t3 on t1.type_id = t3.id
ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml
@@ -19,6 +19,7 @@
        <result column="status" property="status" />
        <result column="last_reminder_time" property="lastReminderTime" />
        <result column="clinic_id" property="clinicId" />
        <result column="use_ai_free_count" property="useAiFreeCount" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -29,12 +30,12 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, nick_name,avatar, phone, birth_time, sex,user_height, user_weight, identifier_number,
          open_id,chronic_disease_id,status,last_reminder_time,
          open_id,chronic_disease_id,status,last_reminder_time,use_ai_free_count,
          office_open_id,clinic_id, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TSysAppUserVO">
        select tsau.id, tsau.nick_name,tsau.avatar, tsau.phone, tsau.birth_time, tsau.sex, tsau.user_height,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,tsau.use_ai_free_count,
       tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time,tsau.clinic_id, tsau.create_time,
       tsau.update_time, tsau.create_by,tsau.update_by, tsau.disabled, tsi.lastInspectionTime
        from t_sys_app_user tsau
@@ -67,7 +68,7 @@
    </select>
    <select id="pageChronicDiseaseUserList" resultType="com.ruoyi.system.vo.TSysAppUserVO">
        select tsau.id, tsau.nick_name,tsau.avatar, tsau.phone, tsau.birth_time, tsau.sex, tsau.user_height,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,tsau.use_ai_free_count,
        tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time,tsau.clinic_id, tsau.create_time,
        tsau.update_time, tsau.create_by,tsau.update_by, tsau.disabled
        from t_sys_app_user tsau
@@ -92,7 +93,7 @@
    </select>
    <select id="exportList" resultType="com.ruoyi.system.export.TSysAppUserListExport">
        select tsau.id, tsau.nick_name,tsau.avatar, tsau.phone, tsau.birth_time, tsau.sex, tsau.user_height,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,tsau.use_ai_free_count,
        tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time,tsau.clinic_id, tsau.create_time,
        tsau.update_time, tsau.create_by,tsau.update_by, tsau.disabled
        from t_sys_app_user tsau
@@ -113,7 +114,7 @@
    </select>
    <select id="exportListClinic" resultType="com.ruoyi.system.export.TSysAppUserClinicExport">
        select tsau.id, tsau.nick_name,tsau.avatar, tsau.phone, tsau.birth_time, tsau.sex, tsau.user_height,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,tsau.use_ai_free_count,
        tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time,tsau.clinic_id, tsau.create_time,
        tsau.update_time, tsau.create_by,tsau.update_by, tsau.disabled
        from t_sys_app_user tsau
@@ -137,7 +138,7 @@
    </select>
    <select id="exportListAppUser" resultType="com.ruoyi.system.export.TSysAppUserExport">
        select tsau.id, tsau.nick_name,tsau.avatar, tsau.phone, tsau.birth_time, tsau.sex, tsau.user_height,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,
        tsau.user_weight, tsau.identifier_number,tsau.open_id,tsau.office_open_id,tsau.use_ai_free_count,
        tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time,tsau.clinic_id, tsau.create_time,
        tsau.update_time, tsau.create_by,tsau.update_by, tsau.disabled, tsi.lastInspectionTime
        from t_sys_app_user tsau
ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
@@ -11,6 +11,7 @@
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="expected_duration" property="expectedDuration" />
        <result column="content_type" property="contentType" />
        <result column="live_way" property="liveWay" />
        <result column="live_mode" property="liveMode" />
        <result column="live_lecturer" property="liveLecturer" />
@@ -32,7 +33,7 @@
    <sql id="Base_Column_List">
        id, live_title, live_cover, live_introduction, start_time,end_time, expected_duration, live_way, live_mode,live_url,
          live_lecturer, live_type, live_detail, push_type,click_count, create_time, update_time, create_by, update_by, disabled,
          gosling_live_id,resource_password
          gosling_live_id,resource_password,content_type
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TSysLiveVO">
        SELECT
ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml
@@ -10,6 +10,9 @@
        <result column="expire_unit" property="expireUnit" />
        <result column="msg_count" property="msgCount" />
        <result column="ai_price" property="aiPrice" />
        <result column="ai_free_count" property="aiFreeCount" />
        <result column="ai_month_price" property="aiMonthPrice" />
        <result column="ai_instructions" property="aiInstructions" />
        <result column="delivery_time" property="deliveryTime" />
        <result column="verify_value" property="verifyValue" />
        <result column="verify_unit" property="verifyUnit" />
@@ -18,13 +21,13 @@
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
        <result column="create_id" property="createId" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, procurement_conditions, points_expiration, expire_unit, msg_count, ai_price, delivery_time,
          verify_value, verify_unit,create_time, update_time, create_by, update_by, disabled, create_id
          verify_value, verify_unit,create_time, update_time, create_by, update_by, disabled,ai_free_count,
          ai_month_price, ai_instructions
    </sql>
</mapper>