lidongdong
2023-09-20 655fb473941ff9c7fd9bfac4530466d1391368d7
新增兑换记录 取货方式字段
3个文件已修改
17 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionExchangeRecord.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionExchangeRecordMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java
@@ -80,5 +80,8 @@
    @ApiModelProperty(value = "实际支付积分")
    private String playIntegral;
    @ApiModelProperty(value = "取货方式(1邮寄  2自提)")
    private String pickUpMethod;
}
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionExchangeRecord.java
@@ -85,4 +85,7 @@
    @ApiModelProperty(value = "实际支付积分")
    private String playIntegral;
    @ApiModelProperty(value = "取货方式(1邮寄  2自提)")
    private String pickUpMethod;
}
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionExchangeRecordMapper.xml
@@ -20,12 +20,14 @@
        <result property="logisticsCompany" column="logistics_company"/>
        <result property="logisticsNum" column="logistics_num"/>
        <result property="playIntegral" column="play_integral"/>
        <result property="pickUpMethod" column="pick_up_method"/>
    </resultMap>
    <sql id="base_sql">
        id,
        order_num,
        user_id,
        pick_up_method,
        (select su.name from union_user as su where su.id=union_exchange_record.user_id) as userName,
        (select su.phone from union_user as su where su.id=union_exchange_record.user_id) as phone,
        goods_id,
@@ -119,6 +121,9 @@
            <if test="item.playIntegral != null">
                play_integral,
            </if>
            <if test="item.pickUpMethod != null">
                pick_up_method,
            </if>
            create_time
        </trim>
        values
@@ -170,6 +175,9 @@
            </if>
            <if test="item.playIntegral != null">
                #{item.playIntegral},
            </if>
            <if test="item.pickUpMethod != null">
                #{item.pickUpMethod},
            </if>
            sysdate()
        </trim>
@@ -226,6 +234,9 @@
            <if test="item.playIntegral != null">
                play_integral=#{item.playIntegral},
            </if>
            <if test="item.pickUpMethod != null">
                pick_up_method=#{item.pickUpMethod},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}