fix 新增商品信息,对接微信支付,除回调接口

ruoyi-system/src/main/java/com/ruoyi/commodity/domain/DoumuCommodityInfo.java

@@ -25,6 +25,10 @@ public class DoumuCommodityInfo extends BaseEntity
     /** 商品金额 */
     @Excel(name = "商品金额")
     private String commodityAmount;
+    /**
+     * 运行时间
+     */
+    private String commodityTime;
 
     /** 商品图片 */
     @Excel(name = "商品图片")
@@ -38,7 +42,15 @@ public class DoumuCommodityInfo extends BaseEntity
     @Excel(name = "排序")
     private Long orders;
 
-    public void setCommodityId(Long commodityId) 
+    public String getCommodityTime() {
+        return commodityTime;
+    }
+
+    public void setCommodityTime(String commodityTime) {
+        this.commodityTime = commodityTime;
+    }
+
+    public void setCommodityId(Long commodityId)
     {
         this.commodityId = commodityId;
     }

ruoyi-system/src/main/resources/mapper/system/DoumuCommodityInfoMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DoumuCommodityInfo" id="DoumuCommodityInfoResult">
         <result property="commodityId"    column="commodity_id"    />
         <result property="commodityName"    column="commodity_name"    />
+        <result property="commodityTime"    column="commodity_time"    />
         <result property="commodityAmount"    column="commodity_amount"    />
         <result property="commodityUrl"    column="commodity_url"    />
         <result property="hardwareNum"    column="hardware_num"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDoumuCommodityInfoVo">
-        select commodity_id, commodity_name, commodity_amount, commodity_url, hardware_num, orders, create_time, create_by, update_by, update_time, remark from doumu_commodity_info
+        select commodity_id, commodity_name, commodity_amount,commodity_time, commodity_url, hardware_num, orders, create_time, create_by, update_by, update_time, remark from doumu_commodity_info
     </sql>
 
     <select id="selectDoumuCommodityInfoList" parameterType="DoumuCommodityInfo" resultMap="DoumuCommodityInfoResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="commodityName != null">commodity_name,</if>
             <if test="commodityAmount != null">commodity_amount,</if>
+            <if test="commodityTime != null">commodity_time,</if>
             <if test="commodityUrl != null and commodityUrl != ''">commodity_url,</if>
             <if test="hardwareNum != null">hardware_num,</if>
             <if test="orders != null">orders,</if>
@@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="commodityName != null">#{commodityName},</if>
             <if test="commodityAmount != null">#{commodityAmount},</if>
+            <if test="commodityTime != null">#{commodityTime},</if>
             <if test="commodityUrl != null and commodityUrl != ''">#{commodityUrl},</if>
             <if test="hardwareNum != null">#{hardwareNum},</if>
             <if test="orders != null">#{orders},</if>
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="commodityName != null">commodity_name = #{commodityName},</if>
             <if test="commodityAmount != null">commodity_amount = #{commodityAmount},</if>
+            <if test="commodityTime != null">commodity_time = #{commodityTime},</if>
             <if test="commodityUrl != null and commodityUrl != ''">commodity_url = #{commodityUrl},</if>
             <if test="hardwareNum != null">hardware_num = #{hardwareNum},</if>
             <if test="orders != null">orders = #{orders},</if>