Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-06-29 16cc7e08398593df62408a34b01402e73c09318e

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml

@@ -33,11 +33,11 @@
                      or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
        </if>
        <if test="record.reserveTimeStart != null">
            and a.reserve_time >= #{record.reserveTimeStart}
            and a.reserve_date >= #{record.reserveTimeStart}
        </if>

        <if test="record.reserveTimeEnd != null">
            and a.reserve_time &lt;= #{record.reserveTimeEnd}
            and a.reserve_date &lt;= #{record.reserveTimeEnd}
        </if>
        order by a.CREATED_TIME desc
    </select>

 gc-shop/src/main/resources/sql

@@ -53,6 +53,14 @@
ALTER TABLE `xzx_score_order`
ADD COLUMN `voucher_img`  varchar(500) NULL COMMENT '凭证' AFTER `remark`;

ALTER TABLE `xzx_user_info`
MODIFY COLUMN `mobile_phone`  varchar(20) CHARACTER SET utf8mb4 NOT NULL COMMENT '手机号码' AFTER `user_id`;

ALTER TABLE `xzx_user_info`
MODIFY COLUMN `nick_name`  varchar(100) CHARACTER SET utf8mb4 NULL DEFAULT NULL AFTER `name`;