From 7c2c6a5e5b3d9f96aef3c67573aa62bbd9a3aa7f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:48:18 +0800
Subject: [PATCH] 修改产品类型,单位工程条偶见查询问题

---
 src/main/resources/mapper/ProductPricingMapper.xml |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/ProductPricingMapper.xml b/src/main/resources/mapper/ProductPricingMapper.xml
index a9966a7..fb76f20 100644
--- a/src/main/resources/mapper/ProductPricingMapper.xml
+++ b/src/main/resources/mapper/ProductPricingMapper.xml
@@ -12,11 +12,12 @@
         <result column="concurrent_nodes" property="concurrentNodes" jdbcType="VARCHAR"/>
         <result column="price_type" property="priceType" jdbcType="VARCHAR"/>
         <result column="price_unit" property="priceUnit" jdbcType="VARCHAR"/>
-        <result column="price" property="price" jdbcType="NUMERIC"/>
+        <result column="points_price" property="pointsPrice" jdbcType="DECIMAL"/>
+        <result column="currency_price" property="currencyPrice" jdbcType="DECIMAL"/>
         <result column="is_active" property="isActive" jdbcType="BOOLEAN"/>
-        <result column="product_id" property="productId" jdbcType="BIGINT"/>
+        <result column="product_id" property="productId" jdbcType="VARCHAR"/>
         <result column="product_name" property="productName" jdbcType="VARCHAR"/>
-        <result column="provider_id" property="providerId" jdbcType="BIGINT"/>
+        <result column="provider_id" property="providerId" jdbcType="VARCHAR"/>
         <result column="provider_name" property="providerName" jdbcType="VARCHAR"/>
         <result column="description" property="description" jdbcType="VARCHAR"/>
         <result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
@@ -29,7 +30,7 @@
     <!-- 鍩虹瀛楁 -->
     <sql id="Base_Column_List">
         id, suite_name, sales_form, customer_type, account_limit, concurrent_nodes, 
-        price_type, price_unit, price, is_active, product_id, product_name, provider_id, 
+        price_type, price_unit, points_price,currency_price, is_active, product_id, product_name, provider_id,
         provider_name, description, created_at, updated_at, created_by, updated_by, deleted
     </sql>
 
@@ -37,7 +38,7 @@
     <select id="selectProductPricingPage" resultMap="BaseResultMap">
         SELECT 
         <include refid="Base_Column_List"/>
-        FROM product_pricing
+        FROM tb_product_pricing
         WHERE deleted = 0
         <if test="productId != null">
             AND product_id = #{productId}
@@ -49,7 +50,7 @@
     <select id="selectByProductId" resultMap="BaseResultMap">
         SELECT 
         <include refid="Base_Column_List"/>
-        FROM product_pricing
+        FROM tb_product_pricing
         WHERE deleted = 0 AND product_id = #{productId}
         ORDER BY created_at DESC
     </select>
@@ -58,7 +59,7 @@
     <select id="selectByCondition" resultMap="BaseResultMap">
         SELECT 
         <include refid="Base_Column_List"/>
-        FROM product_pricing
+        FROM tb_product_pricing
         WHERE deleted = 0
         <if test="suiteName != null and suiteName != ''">
             AND suite_name LIKE CONCAT('%', #{suiteName}, '%')

--
Gitblit v1.8.0