Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java

README.md

@@ -5,7 +5,7 @@ curl --location --request POST 'localhost:8080/base/cloud/spi' \
 --data-raw '{
 "appId":"7264840234423027259",
 "authId":"4463798",
-"method":"getMoveHistoryProductList",
+"method":"searchDSProductCatTree",
 "data":"{\"status\":\"processing\",\"pageSize\":20,\"pageNo\":1}"
 }'
 

ms-dal/src/main/java/com/ms/dal/entity/MoveShopSetting.java

@@ -88,6 +88,16 @@ public class MoveShopSetting implements Serializable {
      */
     private String priceDecimal;
 
+    /**
+     * price_decimal
+     */
+    private String priceDecimalTypeRedio;
+
+    /**
+     * price_decimal
+     */
+    private String priceDecimalType;
+
     /**
      * price_decimal_diy_value
      */

ms-dal/src/main/resources/mapper/MoveShopSettingMapper.xml

@@ -20,6 +20,8 @@
             <result property="priceSub" column="price_sub" jdbcType="DECIMAL"/>
             <result property="priceTail" column="price_tail" jdbcType="BOOLEAN"/>
             <result property="priceDecimal" column="price_decimal" jdbcType="VARCHAR"/>
+            <result property="priceDecimalTypeRedio" column="price_decimal_type_redio" jdbcType="VARCHAR"/>
+            <result property="priceDecimalType" column="price_decimal_type" jdbcType="VARCHAR"/>
             <result property="priceDecimalDiyValue" column="price_decimal_diy_value" jdbcType="VARCHAR"/>
             <result property="isPriceAddPostFee" column="is_price_add_post_fee" jdbcType="BOOLEAN"/>
             <result property="basePriceType" column="base_price_type" jdbcType="TINYINT"/>
@@ -435,7 +437,7 @@
         ,#{buildWhiteBgImgUseMainImgIndex,jdbcType=BOOLEAN},#{isUseSourceLongPic,jdbcType=INTEGER},#{isBuildLongPic,jdbcType=BOOLEAN}
         ,#{buildLongPicMode,jdbcType=VARCHAR},#{buildLongPicUseMainImgIndex,jdbcType=BOOLEAN},#{commonSizeTemplate,jdbcType=VARCHAR}
         ,#{appendSizeTemplateToDescPosition,jdbcType=VARCHAR},#{isAppendSizeTemplateToDesc,jdbcType=BOOLEAN},#{rangePriceGroupId,jdbcType=INTEGER}
-        ,#{useSourcePresell,jdbcType=BOOLEAN})
+        ,#{useSourcePresell,jdbcType=BOOLEAN}),#{priceDecimalTypeRedio,jdbcType=VARCHAR}),#{priceDecimalType,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" keyColumn="move_shop_setting_id" keyProperty="moveShopSettingId" parameterType="com.ms.dal.entity.MoveShopSetting" useGeneratedKeys="true">
         insert into move_shop_setting
@@ -455,6 +457,8 @@
                 <if test="priceSub != null">price_sub,</if>
                 <if test="priceTail != null">price_tail,</if>
                 <if test="priceDecimal != null">price_decimal,</if>
+                <if test="priceDecimalTypeRedio != null">price_decimal_type_redio,</if>
+                <if test="priceDecimalType != null">price_decimal_type,</if>
                 <if test="priceDecimalDiyValue != null">price_decimal_diy_value,</if>
                 <if test="isPriceAddPostFee != null">is_price_add_post_fee,</if>
                 <if test="basePriceType != null">base_price_type,</if>
@@ -659,6 +663,8 @@
                 <if test="priceSub != null">#{priceSub,jdbcType=DECIMAL},</if>
                 <if test="priceTail != null">#{priceTail,jdbcType=BOOLEAN},</if>
                 <if test="priceDecimal != null">#{priceDecimal,jdbcType=VARCHAR},</if>
+                <if test="priceDecimalTypeRedio != null">#{priceDecimalTypeRedio,jdbcType=VARCHAR},</if>
+                <if test="priceDecimalType != null">#{priceDecimalType,jdbcType=VARCHAR},</if>
                 <if test="priceDecimalDiyValue != null">#{priceDecimalDiyValue,jdbcType=VARCHAR},</if>
                 <if test="isPriceAddPostFee != null">#{isPriceAddPostFee,jdbcType=BOOLEAN},</if>
                 <if test="basePriceType != null">#{basePriceType,jdbcType=TINYINT},</if>
@@ -893,6 +899,12 @@
                 <if test="priceDecimal != null">
                     price_decimal = #{priceDecimal,jdbcType=VARCHAR},
                 </if>
+                <if test="priceDecimalType != null">
+                    price_decimal_type = #{priceDecimalType,jdbcType=VARCHAR},
+                </if>
+                <if test="priceDecimalTypeRedio != null">
+                    price_decimal_type_redio = #{priceDecimalTypeRedio,jdbcType=VARCHAR},
+                </if>
                 <if test="priceDecimalDiyValue != null">
                     price_decimal_diy_value = #{priceDecimalDiyValue,jdbcType=VARCHAR},
                 </if>
@@ -1474,6 +1486,8 @@
             price_sub =  #{priceSub,jdbcType=DECIMAL},
             price_tail =  #{priceTail,jdbcType=BOOLEAN},
             price_decimal =  #{priceDecimal,jdbcType=VARCHAR},
+            price_decimal_type_redio =  #{priceDecimalTypeRedio,jdbcType=VARCHAR},
+            price_decimal_type =  #{priceDecimalType,jdbcType=VARCHAR},
             price_decimal_diy_value =  #{priceDecimalDiyValue,jdbcType=VARCHAR},
             is_price_add_post_fee =  #{isPriceAddPostFee,jdbcType=BOOLEAN},
             base_price_type =  #{basePriceType,jdbcType=TINYINT},