yuhongqi 3 viikkoa sitten
vanhempi
commit
9241c58a7b

+ 4 - 0
fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductScrm.java

@@ -380,4 +380,8 @@ public class FsStoreProductScrm extends BaseEntity
 
     /** 过滤商品id */
     private Long[] excludeProductIds;
+
+    /** 标签信息(JSON格式,存储标签类型及预售发货时间,如 {"type":"presale","shippingTime":"2024-01-15 12:00:00"}) */
+    @Excel(name = "标签信息")
+    private String tagInfo;
 }

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/vo/FsStoreProductListVO.java

@@ -128,4 +128,7 @@ public class FsStoreProductListVO  implements Serializable
 
     /** 活动结束时间 */
     private Date activityEndTime;
+
+    /** 标签信息(JSON格式,存储标签类型及预售发货时间) */
+    private String tagInfo;
 }

+ 6 - 2
fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -81,6 +81,7 @@
         <result property="activityType"    column="activity_type"    />
         <result property="activityStartTime"    column="activity_start_time"    />
         <result property="activityEndTime"    column="activity_end_time"    />
+        <result property="tagInfo"    column="tag_info"    />
     </resultMap>
 
     <sql id="selectFsStoreProductVo">
@@ -92,7 +93,7 @@
                is_display,tui_cate_id,company_ids,is_drug,drug_image,drug_reg_cert_no,common_name,dosage_form,
                unit_price,batch_number,mah,mah_address,manufacturer,manufacturer_address,indications,dosage,
                adverse_reactions,contraindications,precautions,is_audit,store_id,return_address,brand,food_production_license_code,
-               origin_place,net_content,shelf_life,domestic_imported,app_ids,purchase_limit,single_purchase_limit,activity_type,activity_start_time,activity_end_time
+               origin_place,net_content,shelf_life,domestic_imported,app_ids,purchase_limit,single_purchase_limit,activity_type,activity_start_time,activity_end_time,tag_info
         from fs_store_product_scrm
     </sql>
 
@@ -105,7 +106,7 @@
                p.is_display,p.tui_cate_id,p.company_ids,p.is_drug,p.drug_image,p.drug_reg_cert_no,p.common_name,p.dosage_form,
                p.unit_price,p.batch_number,p.mah,p.mah_address,p.manufacturer,p.manufacturer_address,p.indications,p.dosage,
                p.adverse_reactions,p.contraindications,p.precautions,p.is_audit,p.store_id,p.return_address,p.brand,p.food_production_license_code,
-               p.origin_place,p.net_content,p.shelf_life,p.domestic_imported,app_ids,p.purchase_limit,p.single_purchase_limit,p.activity_type
+               p.origin_place,p.net_content,p.shelf_life,p.domestic_imported,app_ids,p.purchase_limit,p.single_purchase_limit,p.activity_type,p.tag_info
         from fs_store_product_scrm p
     </sql>
 
@@ -286,6 +287,7 @@
             <if test="purchaseLimit != null">purchase_limit,</if>
             <if test="singlePurchaseLimit != null">single_purchase_limit,</if>
             <if test="activityType != null">activity_type,</if>
+            <if test="tagInfo != null and tagInfo != ''">tag_info,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="image != null and image != ''">#{image},</if>
@@ -361,6 +363,7 @@
             <if test="purchaseLimit != null">#{purchaseLimit},</if>
             <if test="singlePurchaseLimit != null">#{singlePurchaseLimit},</if>
             <if test="activityType != null">#{activityType},</if>
+            <if test="tagInfo != null and tagInfo != ''">#{tagInfo},</if>
         </trim>
     </insert>
 
@@ -440,6 +443,7 @@
             <if test="purchaseLimit != null">purchase_limit = #{purchaseLimit},</if>
             <if test="singlePurchaseLimit != null">single_purchase_limit = #{singlePurchaseLimit},</if>
             <if test="activityType != null">activity_type = #{activityType},</if>
+            <if test="tagInfo != null and tagInfo != ''">tag_info = #{tagInfo},</if>
         </trim>
         where product_id = #{productId}
     </update>