From 105d54202aaa736fcadfa5ff37a4b4a2fe9acf16 Mon Sep 17 00:00:00 2001
From: YuanYe <418471657@qq.com>
Date: Thu, 29 Aug 2024 09:34:23 +0800
Subject: [PATCH] 1

---
 .../com/hfkj/dao/BsOrderCinemaMapper.java     | 123 ++-----------
 .../hfkj/dao/BsOrderCinemaSqlProvider.java    | 163 ++----------------
 .../com/hfkj/dao/BsOrderCouponMapper.java     |  72 ++++----
 .../hfkj/dao/BsOrderCouponSqlProvider.java    |  28 +++
 .../java/com/hfkj/dao/BsOrderGoodsMapper.java |  43 ++---
 .../com/hfkj/dao/BsOrderGoodsSqlProvider.java |  14 ++
 .../com/hfkj/dao/BsOrderStarbucksMapper.java  |  43 ++---
 .../hfkj/dao/BsOrderStarbucksSqlProvider.java |  14 ++
 .../java/com/hfkj/entity/BsOrderCinema.java   | 119 ++-----------
 .../com/hfkj/entity/BsOrderCinemaExample.java |  70 ++++++++
 .../java/com/hfkj/entity/BsOrderCoupon.java   |  32 ++++
 .../com/hfkj/entity/BsOrderCouponExample.java | 130 ++++++++++++++
 .../java/com/hfkj/entity/BsOrderGoods.java    |  16 ++
 .../com/hfkj/entity/BsOrderGoodsExample.java  |  70 ++++++++
 .../com/hfkj/entity/BsOrderStarbucks.java     |  16 ++
 .../hfkj/entity/BsOrderStarbucksExample.java  |  70 ++++++++
 16 files changed, 581 insertions(+), 442 deletions(-)

diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java
index 3d1dadf..c9c3cdd 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java
@@ -3,7 +3,6 @@ package com.hfkj.dao;
 import com.hfkj.entity.BsOrderCinema;
 import com.hfkj.entity.BsOrderCinemaExample;
 import java.util.List;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.InsertProvider;
@@ -11,9 +10,7 @@ import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.stereotype.Repository;
@@ -32,20 +29,15 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt {
     @DeleteProvider(type=BsOrderCinemaSqlProvider.class, method="deleteByExample")
     int deleteByExample(BsOrderCinemaExample example);
 
-    @Delete({
-        "delete from bs_order_cinema",
-        "where id = #{id,jdbcType=BIGINT}"
-    })
-    int deleteByPrimaryKey(Long id);
-
     @Insert({
         "insert into bs_order_cinema (draw_mode, accept_adjust, ",
         "cinema_id, show_id, ",
         "film_id, seats_count, ",
         "seats, img, goods_name, ",
-        "goods_specs_name, order_no, ",
-        "child_order_no, channel_order_no, ",
-        "mer_id, user_id, user_phone, ",
+        "goods_specs_name, platform_code, ",
+        "order_no, child_order_no, ",
+        "channel_order_no, mer_id, ",
+        "user_id, user_phone, ",
         "total_price, total_deduction_price, ",
         "coupon_discount_price, integral_discount_price, ",
         "pay_real_price, pay_channel, ",
@@ -60,9 +52,10 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt {
         "#{cinemaId,jdbcType=INTEGER}, #{showId,jdbcType=BIGINT}, ",
         "#{filmId,jdbcType=INTEGER}, #{seatsCount,jdbcType=INTEGER}, ",
         "#{seats,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{goodsName,jdbcType=VARCHAR}, ",
-        "#{goodsSpecsName,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ",
-        "#{childOrderNo,jdbcType=VARCHAR}, #{channelOrderNo,jdbcType=VARCHAR}, ",
-        "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
+        "#{goodsSpecsName,jdbcType=VARCHAR}, #{platformCode,jdbcType=VARCHAR}, ",
+        "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
+        "#{channelOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ",
+        "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
         "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ",
         "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ",
         "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ",
@@ -83,7 +76,7 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt {
 
     @SelectProvider(type=BsOrderCinemaSqlProvider.class, method="selectByExample")
     @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT),
         @Result(column="draw_mode", property="drawMode", jdbcType=JdbcType.INTEGER),
         @Result(column="accept_adjust", property="acceptAdjust", jdbcType=JdbcType.BIT),
         @Result(column="cinema_id", property="cinemaId", jdbcType=JdbcType.INTEGER),
@@ -94,6 +87,7 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt {
         @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR),
@@ -123,106 +117,9 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt {
     })
     List<BsOrderCinema> selectByExample(BsOrderCinemaExample example);
 
-    @Select({
-        "select",
-        "id, draw_mode, accept_adjust, cinema_id, show_id, film_id, seats_count, seats, ",
-        "img, goods_name, goods_specs_name, order_no, child_order_no, channel_order_no, ",
-        "mer_id, user_id, user_phone, total_price, total_deduction_price, coupon_discount_price, ",
-        "integral_discount_price, pay_real_price, pay_channel, pay_serial_no, pay_type, ",
-        "`status`, create_time, pay_time, cancel_time, refund_time, finish_time, update_time, ",
-        "exception_status, exception_msg, ext_1, ext_2, ext_3",
-        "from bs_order_cinema",
-        "where id = #{id,jdbcType=BIGINT}"
-    })
-    @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="draw_mode", property="drawMode", jdbcType=JdbcType.INTEGER),
-        @Result(column="accept_adjust", property="acceptAdjust", jdbcType=JdbcType.BIT),
-        @Result(column="cinema_id", property="cinemaId", jdbcType=JdbcType.INTEGER),
-        @Result(column="show_id", property="showId", jdbcType=JdbcType.BIGINT),
-        @Result(column="film_id", property="filmId", jdbcType=JdbcType.INTEGER),
-        @Result(column="seats_count", property="seatsCount", jdbcType=JdbcType.INTEGER),
-        @Result(column="seats", property="seats", jdbcType=JdbcType.VARCHAR),
-        @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
-        @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
-        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
-        @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
-        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER),
-        @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
-        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
-        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="exception_status", property="exceptionStatus", jdbcType=JdbcType.BIT),
-        @Result(column="exception_msg", property="exceptionMsg", jdbcType=JdbcType.VARCHAR),
-        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
-        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
-        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
-    })
-    BsOrderCinema selectByPrimaryKey(Long id);
-
     @UpdateProvider(type=BsOrderCinemaSqlProvider.class, method="updateByExampleSelective")
     int updateByExampleSelective(@Param("record") BsOrderCinema record, @Param("example") BsOrderCinemaExample example);
 
     @UpdateProvider(type=BsOrderCinemaSqlProvider.class, method="updateByExample")
     int updateByExample(@Param("record") BsOrderCinema record, @Param("example") BsOrderCinemaExample example);
-
-    @UpdateProvider(type=BsOrderCinemaSqlProvider.class, method="updateByPrimaryKeySelective")
-    int updateByPrimaryKeySelective(BsOrderCinema record);
-
-    @Update({
-        "update bs_order_cinema",
-        "set draw_mode = #{drawMode,jdbcType=INTEGER},",
-          "accept_adjust = #{acceptAdjust,jdbcType=BIT},",
-          "cinema_id = #{cinemaId,jdbcType=INTEGER},",
-          "show_id = #{showId,jdbcType=BIGINT},",
-          "film_id = #{filmId,jdbcType=INTEGER},",
-          "seats_count = #{seatsCount,jdbcType=INTEGER},",
-          "seats = #{seats,jdbcType=VARCHAR},",
-          "img = #{img,jdbcType=VARCHAR},",
-          "goods_name = #{goodsName,jdbcType=VARCHAR},",
-          "goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR},",
-          "order_no = #{orderNo,jdbcType=VARCHAR},",
-          "child_order_no = #{childOrderNo,jdbcType=VARCHAR},",
-          "channel_order_no = #{channelOrderNo,jdbcType=VARCHAR},",
-          "mer_id = #{merId,jdbcType=BIGINT},",
-          "user_id = #{userId,jdbcType=BIGINT},",
-          "user_phone = #{userPhone,jdbcType=VARCHAR},",
-          "total_price = #{totalPrice,jdbcType=DECIMAL},",
-          "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},",
-          "coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL},",
-          "integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL},",
-          "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},",
-          "pay_channel = #{payChannel,jdbcType=INTEGER},",
-          "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},",
-          "pay_type = #{payType,jdbcType=INTEGER},",
-          "`status` = #{status,jdbcType=INTEGER},",
-          "create_time = #{createTime,jdbcType=TIMESTAMP},",
-          "pay_time = #{payTime,jdbcType=TIMESTAMP},",
-          "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},",
-          "refund_time = #{refundTime,jdbcType=TIMESTAMP},",
-          "finish_time = #{finishTime,jdbcType=TIMESTAMP},",
-          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
-          "exception_status = #{exceptionStatus,jdbcType=BIT},",
-          "exception_msg = #{exceptionMsg,jdbcType=VARCHAR},",
-          "ext_1 = #{ext1,jdbcType=VARCHAR},",
-          "ext_2 = #{ext2,jdbcType=VARCHAR},",
-          "ext_3 = #{ext3,jdbcType=VARCHAR}",
-        "where id = #{id,jdbcType=BIGINT}"
-    })
-    int updateByPrimaryKey(BsOrderCinema record);
 }
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java
index b8cfff9..a1aa4d4 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java
@@ -68,6 +68,10 @@ public class BsOrderCinemaSqlProvider {
             sql.VALUES("goods_specs_name", "#{goodsSpecsName,jdbcType=VARCHAR}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getOrderNo() != null) {
             sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
         }
@@ -192,6 +196,7 @@ public class BsOrderCinemaSqlProvider {
         sql.SELECT("img");
         sql.SELECT("goods_name");
         sql.SELECT("goods_specs_name");
+        sql.SELECT("platform_code");
         sql.SELECT("order_no");
         sql.SELECT("child_order_no");
         sql.SELECT("channel_order_no");
@@ -279,6 +284,10 @@ public class BsOrderCinemaSqlProvider {
             sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getOrderNo() != null) {
             sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
         }
@@ -402,6 +411,7 @@ public class BsOrderCinemaSqlProvider {
         sql.SET("img = #{record.img,jdbcType=VARCHAR}");
         sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
         sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}");
+        sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
         sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
         sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
         sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}");
@@ -434,159 +444,6 @@ public class BsOrderCinemaSqlProvider {
         return sql.toString();
     }
 
-    public String updateByPrimaryKeySelective(BsOrderCinema record) {
-        SQL sql = new SQL();
-        sql.UPDATE("bs_order_cinema");
-        
-        if (record.getDrawMode() != null) {
-            sql.SET("draw_mode = #{drawMode,jdbcType=INTEGER}");
-        }
-        
-        if (record.getAcceptAdjust() != null) {
-            sql.SET("accept_adjust = #{acceptAdjust,jdbcType=BIT}");
-        }
-        
-        if (record.getCinemaId() != null) {
-            sql.SET("cinema_id = #{cinemaId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getShowId() != null) {
-            sql.SET("show_id = #{showId,jdbcType=BIGINT}");
-        }
-        
-        if (record.getFilmId() != null) {
-            sql.SET("film_id = #{filmId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getSeatsCount() != null) {
-            sql.SET("seats_count = #{seatsCount,jdbcType=INTEGER}");
-        }
-        
-        if (record.getSeats() != null) {
-            sql.SET("seats = #{seats,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getImg() != null) {
-            sql.SET("img = #{img,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getGoodsName() != null) {
-            sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getGoodsSpecsName() != null) {
-            sql.SET("goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getOrderNo() != null) {
-            sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getChildOrderNo() != null) {
-            sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getChannelOrderNo() != null) {
-            sql.SET("channel_order_no = #{channelOrderNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getMerId() != null) {
-            sql.SET("mer_id = #{merId,jdbcType=BIGINT}");
-        }
-        
-        if (record.getUserId() != null) {
-            sql.SET("user_id = #{userId,jdbcType=BIGINT}");
-        }
-        
-        if (record.getUserPhone() != null) {
-            sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getTotalPrice() != null) {
-            sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getTotalDeductionPrice() != null) {
-            sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getCouponDiscountPrice() != null) {
-            sql.SET("coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIntegralDiscountPrice() != null) {
-            sql.SET("integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getPayRealPrice() != null) {
-            sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getPayChannel() != null) {
-            sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}");
-        }
-        
-        if (record.getPaySerialNo() != null) {
-            sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getPayType() != null) {
-            sql.SET("pay_type = #{payType,jdbcType=INTEGER}");
-        }
-        
-        if (record.getStatus() != null) {
-            sql.SET("`status` = #{status,jdbcType=INTEGER}");
-        }
-        
-        if (record.getCreateTime() != null) {
-            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getPayTime() != null) {
-            sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getCancelTime() != null) {
-            sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getRefundTime() != null) {
-            sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getFinishTime() != null) {
-            sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getUpdateTime() != null) {
-            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
-        }
-        
-        if (record.getExceptionStatus() != null) {
-            sql.SET("exception_status = #{exceptionStatus,jdbcType=BIT}");
-        }
-        
-        if (record.getExceptionMsg() != null) {
-            sql.SET("exception_msg = #{exceptionMsg,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getExt1() != null) {
-            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getExt2() != null) {
-            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getExt3() != null) {
-            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
-        }
-        
-        sql.WHERE("id = #{id,jdbcType=BIGINT}");
-        
-        return sql.toString();
-    }
-
     protected void applyWhere(SQL sql, BsOrderCinemaExample example, boolean includeExamplePhrase) {
         if (example == null) {
             return;
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java
index e5bd8a3..545e191 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java
@@ -40,39 +40,43 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
 
     @Insert({
         "insert into bs_order_coupon (order_no, child_order_no, ",
-        "mer_id, user_id, user_phone, ",
+        "mer_id, platform_code, ",
+        "user_id, user_phone, ",
         "goods_id, goods_name, ",
         "goods_type_id, goods_type_name, ",
         "goods_brand_id, goods_brand_name, ",
         "goods_specs_id, goods_specs_name, ",
-        "goods_spesc_original_price, goods_vpd_id, ",
-        "goods_vpd_key, goods_vpd_source, ",
-        "goods_count, total_price, ",
-        "total_deduction_price, coupon_discount_price, ",
-        "integral_discount_price, pay_real_price, ",
-        "pay_channel, pay_serial_no, ",
-        "pay_type, `status`, ",
-        "create_time, pay_time, ",
-        "cancel_time, refund_time, ",
-        "finish_time, update_time, ",
-        "ext_1, ext_2, ext_3)",
+        "goods_spesc_original_price, goods_spesc_sale_price, ",
+        "goods_vpd_id, goods_vpd_key, ",
+        "goods_vpd_source, goods_count, ",
+        "total_price, total_deduction_price, ",
+        "coupon_discount_price, integral_discount_price, ",
+        "pay_real_price, pay_channel, ",
+        "pay_serial_no, pay_type, ",
+        "`status`, create_time, ",
+        "pay_time, cancel_time, ",
+        "refund_time, finish_time, ",
+        "update_time, ext_1, ",
+        "ext_2, ext_3)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
-        "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
+        "#{merId,jdbcType=BIGINT}, #{platformCode,jdbcType=VARCHAR}, ",
+        "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
         "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ",
         "#{goodsTypeId,jdbcType=BIGINT}, #{goodsTypeName,jdbcType=VARCHAR}, ",
         "#{goodsBrandId,jdbcType=BIGINT}, #{goodsBrandName,jdbcType=VARCHAR}, ",
         "#{goodsSpecsId,jdbcType=BIGINT}, #{goodsSpecsName,jdbcType=VARCHAR}, ",
-        "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}, #{goodsVpdId,jdbcType=BIGINT}, ",
-        "#{goodsVpdKey,jdbcType=VARCHAR}, #{goodsVpdSource,jdbcType=INTEGER}, ",
-        "#{goodsCount,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ",
-        "#{totalDeductionPrice,jdbcType=DECIMAL}, #{couponDiscountPrice,jdbcType=DECIMAL}, ",
-        "#{integralDiscountPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ",
-        "#{payChannel,jdbcType=INTEGER}, #{paySerialNo,jdbcType=VARCHAR}, ",
-        "#{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, ",
-        "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
-        "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ",
-        "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
-        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}, #{goodsSpescSalePrice,jdbcType=DECIMAL}, ",
+        "#{goodsVpdId,jdbcType=BIGINT}, #{goodsVpdKey,jdbcType=VARCHAR}, ",
+        "#{goodsVpdSource,jdbcType=INTEGER}, #{goodsCount,jdbcType=INTEGER}, ",
+        "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ",
+        "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ",
+        "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ",
+        "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ",
+        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
+        "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(BsOrderCoupon record);
@@ -87,6 +91,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
         @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
         @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
@@ -98,6 +103,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
         @Result(column="goods_specs_id", property="goodsSpecsId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_spesc_original_price", property="goodsSpescOriginalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="goods_spesc_sale_price", property="goodsSpescSalePrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="goods_vpd_id", property="goodsVpdId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_vpd_key", property="goodsVpdKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_vpd_source", property="goodsVpdSource", jdbcType=JdbcType.INTEGER),
@@ -125,13 +131,13 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
 
     @Select({
         "select",
-        "id, order_no, child_order_no, mer_id, user_id, user_phone, goods_id, goods_name, ",
-        "goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, goods_specs_id, ",
-        "goods_specs_name, goods_spesc_original_price, goods_vpd_id, goods_vpd_key, goods_vpd_source, ",
-        "goods_count, total_price, total_deduction_price, coupon_discount_price, integral_discount_price, ",
-        "pay_real_price, pay_channel, pay_serial_no, pay_type, `status`, create_time, ",
-        "pay_time, cancel_time, refund_time, finish_time, update_time, ext_1, ext_2, ",
-        "ext_3",
+        "id, order_no, child_order_no, mer_id, platform_code, user_id, user_phone, goods_id, ",
+        "goods_name, goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, ",
+        "goods_specs_id, goods_specs_name, goods_spesc_original_price, goods_spesc_sale_price, ",
+        "goods_vpd_id, goods_vpd_key, goods_vpd_source, goods_count, total_price, total_deduction_price, ",
+        "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ",
+        "pay_serial_no, pay_type, `status`, create_time, pay_time, cancel_time, refund_time, ",
+        "finish_time, update_time, ext_1, ext_2, ext_3",
         "from bs_order_coupon",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -140,6 +146,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
         @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
         @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
@@ -151,6 +158,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
         @Result(column="goods_specs_id", property="goodsSpecsId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_spesc_original_price", property="goodsSpescOriginalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="goods_spesc_sale_price", property="goodsSpescSalePrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="goods_vpd_id", property="goodsVpdId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_vpd_key", property="goodsVpdKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_vpd_source", property="goodsVpdSource", jdbcType=JdbcType.INTEGER),
@@ -190,6 +198,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
         "set order_no = #{orderNo,jdbcType=VARCHAR},",
           "child_order_no = #{childOrderNo,jdbcType=VARCHAR},",
           "mer_id = #{merId,jdbcType=BIGINT},",
+          "platform_code = #{platformCode,jdbcType=VARCHAR},",
           "user_id = #{userId,jdbcType=BIGINT},",
           "user_phone = #{userPhone,jdbcType=VARCHAR},",
           "goods_id = #{goodsId,jdbcType=BIGINT},",
@@ -201,6 +210,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt {
           "goods_specs_id = #{goodsSpecsId,jdbcType=BIGINT},",
           "goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR},",
           "goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL},",
+          "goods_spesc_sale_price = #{goodsSpescSalePrice,jdbcType=DECIMAL},",
           "goods_vpd_id = #{goodsVpdId,jdbcType=BIGINT},",
           "goods_vpd_key = #{goodsVpdKey,jdbcType=VARCHAR},",
           "goods_vpd_source = #{goodsVpdSource,jdbcType=INTEGER},",
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java
index 2c2b6fd..6d99697 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java
@@ -40,6 +40,10 @@ public class BsOrderCouponSqlProvider {
             sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getUserId() != null) {
             sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
         }
@@ -84,6 +88,10 @@ public class BsOrderCouponSqlProvider {
             sql.VALUES("goods_spesc_original_price", "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getGoodsSpescSalePrice() != null) {
+            sql.VALUES("goods_spesc_sale_price", "#{goodsSpescSalePrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getGoodsVpdId() != null) {
             sql.VALUES("goods_vpd_id", "#{goodsVpdId,jdbcType=BIGINT}");
         }
@@ -185,6 +193,7 @@ public class BsOrderCouponSqlProvider {
         sql.SELECT("order_no");
         sql.SELECT("child_order_no");
         sql.SELECT("mer_id");
+        sql.SELECT("platform_code");
         sql.SELECT("user_id");
         sql.SELECT("user_phone");
         sql.SELECT("goods_id");
@@ -196,6 +205,7 @@ public class BsOrderCouponSqlProvider {
         sql.SELECT("goods_specs_id");
         sql.SELECT("goods_specs_name");
         sql.SELECT("goods_spesc_original_price");
+        sql.SELECT("goods_spesc_sale_price");
         sql.SELECT("goods_vpd_id");
         sql.SELECT("goods_vpd_key");
         sql.SELECT("goods_vpd_source");
@@ -251,6 +261,10 @@ public class BsOrderCouponSqlProvider {
             sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getUserId() != null) {
             sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
         }
@@ -295,6 +309,10 @@ public class BsOrderCouponSqlProvider {
             sql.SET("goods_spesc_original_price = #{record.goodsSpescOriginalPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getGoodsSpescSalePrice() != null) {
+            sql.SET("goods_spesc_sale_price = #{record.goodsSpescSalePrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getGoodsVpdId() != null) {
             sql.SET("goods_vpd_id = #{record.goodsVpdId,jdbcType=BIGINT}");
         }
@@ -395,6 +413,7 @@ public class BsOrderCouponSqlProvider {
         sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
         sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
         sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
         sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
         sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
         sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
@@ -406,6 +425,7 @@ public class BsOrderCouponSqlProvider {
         sql.SET("goods_specs_id = #{record.goodsSpecsId,jdbcType=BIGINT}");
         sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}");
         sql.SET("goods_spesc_original_price = #{record.goodsSpescOriginalPrice,jdbcType=DECIMAL}");
+        sql.SET("goods_spesc_sale_price = #{record.goodsSpescSalePrice,jdbcType=DECIMAL}");
         sql.SET("goods_vpd_id = #{record.goodsVpdId,jdbcType=BIGINT}");
         sql.SET("goods_vpd_key = #{record.goodsVpdKey,jdbcType=VARCHAR}");
         sql.SET("goods_vpd_source = #{record.goodsVpdSource,jdbcType=INTEGER}");
@@ -450,6 +470,10 @@ public class BsOrderCouponSqlProvider {
             sql.SET("mer_id = #{merId,jdbcType=BIGINT}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getUserId() != null) {
             sql.SET("user_id = #{userId,jdbcType=BIGINT}");
         }
@@ -494,6 +518,10 @@ public class BsOrderCouponSqlProvider {
             sql.SET("goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getGoodsSpescSalePrice() != null) {
+            sql.SET("goods_spesc_sale_price = #{goodsSpescSalePrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getGoodsVpdId() != null) {
             sql.SET("goods_vpd_id = #{goodsVpdId,jdbcType=BIGINT}");
         }
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java
index b987775..ad4953e 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java
@@ -51,15 +51,15 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
         "goods_specs_original_price, goods_count, ",
         "total_price, total_deduction_price, ",
         "coupon_discount_price, integral_discount_price, ",
-        "pay_real_price, pay_channel, ",
-        "pay_serial_no, pay_type, ",
-        "`status`, logistics_status_desc, ",
-        "logistics_status, create_time, ",
-        "pay_time, cancel_time, ",
-        "refund_time, finish_time, ",
-        "update_time, exception_status, ",
-        "exception_msg, ext_1, ",
-        "ext_2, ext_3)",
+        "platform_code, pay_real_price, ",
+        "pay_channel, pay_serial_no, ",
+        "pay_type, `status`, ",
+        "logistics_status_desc, logistics_status, ",
+        "create_time, pay_time, ",
+        "cancel_time, refund_time, ",
+        "finish_time, update_time, ",
+        "exception_status, exception_msg, ",
+        "ext_1, ext_2, ext_3)",
         "values (#{logisticsNo,jdbcType=VARCHAR}, #{freightPrice,jdbcType=DECIMAL}, ",
         "#{deliveryAddressId,jdbcType=BIGINT}, #{deliveryAddress,jdbcType=VARCHAR}, ",
         "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
@@ -72,15 +72,15 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
         "#{goodsSpecsOriginalPrice,jdbcType=DECIMAL}, #{goodsCount,jdbcType=INTEGER}, ",
         "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ",
         "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ",
-        "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ",
-        "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ",
-        "#{status,jdbcType=INTEGER}, #{logisticsStatusDesc,jdbcType=VARCHAR}, ",
-        "#{logisticsStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
-        "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
-        "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
-        "#{updateTime,jdbcType=TIMESTAMP}, #{exceptionStatus,jdbcType=BIT}, ",
-        "#{exceptionMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{platformCode,jdbcType=VARCHAR}, #{payRealPrice,jdbcType=DECIMAL}, ",
+        "#{payChannel,jdbcType=INTEGER}, #{paySerialNo,jdbcType=VARCHAR}, ",
+        "#{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, ",
+        "#{logisticsStatusDesc,jdbcType=VARCHAR}, #{logisticsStatus,jdbcType=VARCHAR}, ",
+        "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
+        "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ",
+        "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{exceptionStatus,jdbcType=BIT}, #{exceptionMsg,jdbcType=VARCHAR}, ",
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(BsOrderGoods record);
@@ -117,6 +117,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
         @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
@@ -144,8 +145,8 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
         "child_order_no, mer_id, mer_name, user_id, user_phone, goods_id, img, goods_name, ",
         "goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, goods_specs_id, ",
         "goods_specs_name, goods_specs_original_price, goods_count, total_price, total_deduction_price, ",
-        "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ",
-        "pay_serial_no, pay_type, `status`, logistics_status_desc, logistics_status, ",
+        "coupon_discount_price, integral_discount_price, platform_code, pay_real_price, ",
+        "pay_channel, pay_serial_no, pay_type, `status`, logistics_status_desc, logistics_status, ",
         "create_time, pay_time, cancel_time, refund_time, finish_time, update_time, exception_status, ",
         "exception_msg, ext_1, ext_2, ext_3",
         "from bs_order_goods",
@@ -178,6 +179,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
         @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
@@ -235,6 +237,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
           "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},",
           "coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL},",
           "integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL},",
+          "platform_code = #{platformCode,jdbcType=VARCHAR},",
           "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},",
           "pay_channel = #{payChannel,jdbcType=INTEGER},",
           "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},",
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java
index 6c5c8e2..6dc8d10 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java
@@ -128,6 +128,10 @@ public class BsOrderGoodsSqlProvider {
             sql.VALUES("integral_discount_price", "#{integralDiscountPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}");
         }
@@ -235,6 +239,7 @@ public class BsOrderGoodsSqlProvider {
         sql.SELECT("total_deduction_price");
         sql.SELECT("coupon_discount_price");
         sql.SELECT("integral_discount_price");
+        sql.SELECT("platform_code");
         sql.SELECT("pay_real_price");
         sql.SELECT("pay_channel");
         sql.SELECT("pay_serial_no");
@@ -374,6 +379,10 @@ public class BsOrderGoodsSqlProvider {
             sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
         }
@@ -480,6 +489,7 @@ public class BsOrderGoodsSqlProvider {
         sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}");
         sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}");
         sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}");
+        sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
         sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
         sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
         sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
@@ -608,6 +618,10 @@ public class BsOrderGoodsSqlProvider {
             sql.SET("integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}");
         }
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java
index 4f6a741..28de64b 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java
@@ -39,27 +39,27 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into bs_order_starbucks (store_code, platform_unique_id, ",
-        "product_id, cup_size, ",
-        "temperature, cream, ",
-        "espresso, milk, ",
-        "milk_bubble, num, ",
-        "img, `name`, order_no, ",
-        "child_order_no, mer_id, ",
-        "user_id, user_phone, ",
+        "insert into bs_order_starbucks (store_code, platform_code, ",
+        "platform_unique_id, product_id, ",
+        "cup_size, temperature, ",
+        "cream, espresso, ",
+        "milk, milk_bubble, ",
+        "num, img, `name`, ",
+        "order_no, child_order_no, ",
+        "mer_id, user_id, user_phone, ",
         "price, store_address, ",
         "store_name, pay_type, ",
         "`status`, create_time, ",
         "update_time, ext_1, ",
         "ext_2, ext_3)",
-        "values (#{storeCode,jdbcType=VARCHAR}, #{platformUniqueId,jdbcType=VARCHAR}, ",
-        "#{productId,jdbcType=INTEGER}, #{cupSize,jdbcType=VARCHAR}, ",
-        "#{temperature,jdbcType=VARCHAR}, #{cream,jdbcType=VARCHAR}, ",
-        "#{espresso,jdbcType=VARCHAR}, #{milk,jdbcType=VARCHAR}, ",
-        "#{milkBubble,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, ",
-        "#{img,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ",
-        "#{childOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ",
-        "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
+        "values (#{storeCode,jdbcType=VARCHAR}, #{platformCode,jdbcType=VARCHAR}, ",
+        "#{platformUniqueId,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, ",
+        "#{cupSize,jdbcType=VARCHAR}, #{temperature,jdbcType=VARCHAR}, ",
+        "#{cream,jdbcType=VARCHAR}, #{espresso,jdbcType=VARCHAR}, ",
+        "#{milk,jdbcType=VARCHAR}, #{milkBubble,jdbcType=VARCHAR}, ",
+        "#{num,jdbcType=INTEGER}, #{img,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
+        "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
+        "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ",
         "#{price,jdbcType=DECIMAL}, #{storeAddress,jdbcType=VARCHAR}, ",
         "#{storeName,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ",
         "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
@@ -77,6 +77,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="store_code", property="storeCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="platform_unique_id", property="platformUniqueId", jdbcType=JdbcType.VARCHAR),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.INTEGER),
         @Result(column="cup_size", property="cupSize", jdbcType=JdbcType.VARCHAR),
@@ -108,16 +109,17 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt {
 
     @Select({
         "select",
-        "id, store_code, platform_unique_id, product_id, cup_size, temperature, cream, ",
-        "espresso, milk, milk_bubble, num, img, `name`, order_no, child_order_no, mer_id, ",
-        "user_id, user_phone, price, store_address, store_name, pay_type, `status`, create_time, ",
-        "update_time, ext_1, ext_2, ext_3",
+        "id, store_code, platform_code, platform_unique_id, product_id, cup_size, temperature, ",
+        "cream, espresso, milk, milk_bubble, num, img, `name`, order_no, child_order_no, ",
+        "mer_id, user_id, user_phone, price, store_address, store_name, pay_type, `status`, ",
+        "create_time, update_time, ext_1, ext_2, ext_3",
         "from bs_order_starbucks",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="store_code", property="storeCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
         @Result(column="platform_unique_id", property="platformUniqueId", jdbcType=JdbcType.VARCHAR),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.INTEGER),
         @Result(column="cup_size", property="cupSize", jdbcType=JdbcType.VARCHAR),
@@ -159,6 +161,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt {
     @Update({
         "update bs_order_starbucks",
         "set store_code = #{storeCode,jdbcType=VARCHAR},",
+          "platform_code = #{platformCode,jdbcType=VARCHAR},",
           "platform_unique_id = #{platformUniqueId,jdbcType=VARCHAR},",
           "product_id = #{productId,jdbcType=INTEGER},",
           "cup_size = #{cupSize,jdbcType=VARCHAR},",
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java
index e4490fd..780ba8f 100644
--- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java
+++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java
@@ -32,6 +32,10 @@ public class BsOrderStarbucksSqlProvider {
             sql.VALUES("store_code", "#{storeCode,jdbcType=VARCHAR}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPlatformUniqueId() != null) {
             sql.VALUES("platform_unique_id", "#{platformUniqueId,jdbcType=VARCHAR}");
         }
@@ -147,6 +151,7 @@ public class BsOrderStarbucksSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("store_code");
+        sql.SELECT("platform_code");
         sql.SELECT("platform_unique_id");
         sql.SELECT("product_id");
         sql.SELECT("cup_size");
@@ -198,6 +203,10 @@ public class BsOrderStarbucksSqlProvider {
             sql.SET("store_code = #{record.storeCode,jdbcType=VARCHAR}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPlatformUniqueId() != null) {
             sql.SET("platform_unique_id = #{record.platformUniqueId,jdbcType=VARCHAR}");
         }
@@ -312,6 +321,7 @@ public class BsOrderStarbucksSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("store_code = #{record.storeCode,jdbcType=VARCHAR}");
+        sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
         sql.SET("platform_unique_id = #{record.platformUniqueId,jdbcType=VARCHAR}");
         sql.SET("product_id = #{record.productId,jdbcType=INTEGER}");
         sql.SET("cup_size = #{record.cupSize,jdbcType=VARCHAR}");
@@ -352,6 +362,10 @@ public class BsOrderStarbucksSqlProvider {
             sql.SET("store_code = #{storeCode,jdbcType=VARCHAR}");
         }
         
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPlatformUniqueId() != null) {
             sql.SET("platform_unique_id = #{platformUniqueId,jdbcType=VARCHAR}");
         }
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCinema.java b/service/src/main/java/com/hfkj/entity/BsOrderCinema.java
index ac0b405..6d9488a 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderCinema.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderCinema.java
@@ -14,179 +14,77 @@ import java.util.Date;
  * 
  **/
 public class BsOrderCinema implements Serializable {
-    /**
-     * 主键
-     */
     private Long id;
 
-    /**
-     * 0:特惠出票 5:快速出票
-     */
     private Integer drawMode;
 
-    /**
-     * 是否接受调座
-     */
     private Boolean acceptAdjust;
 
-    /**
-     * 影院Id
-     */
     private Integer cinemaId;
 
-    /**
-     * 场次id
-     */
     private Long showId;
 
-    /**
-     * 	影片id
-     */
     private Integer filmId;
 
-    /**
-     * 座位数量
-     */
     private Integer seatsCount;
 
-    /**
-     * 原始座位id，多个座位用英文,号分割
-     */
     private String seats;
 
-    /**
-     * 产品图片
-     */
     private String img;
 
-    /**
-     * 商品名称
-     */
     private String goodsName;
 
-    /**
-     * 商品规格名称
-     */
     private String goodsSpecsName;
 
     /**
-     * 交易订单号
+     * 登录平台code
      */
+    private String platformCode;
+
     private String orderNo;
 
-    /**
-     * 子订单号
-     */
     private String childOrderNo;
 
-    /**
-     * 渠道订单号
-     */
     private String channelOrderNo;
 
-    /**
-     * 商户id
-     */
     private Long merId;
 
-    /**
-     * 用户id
-     */
     private Long userId;
 
-    /**
-     * 用户手机号
-     */
     private String userPhone;
 
-    /**
-     * 交易金额
-     */
     private BigDecimal totalPrice;
 
-    /**
-     * 总优惠金额（优惠券优惠金额 + 积分抵扣）
-     */
     private BigDecimal totalDeductionPrice;
 
-    /**
-     * 优惠券优惠金额
-     */
     private BigDecimal couponDiscountPrice;
 
-    /**
-     * 积分抵扣优惠金额
-     */
     private Long integralDiscountPrice;
 
-    /**
-     * 实付金额
-     */
     private BigDecimal payRealPrice;
 
-    /**
-     * 支付渠道与bs_order订单表同步
-     */
     private Integer payChannel;
 
-    /**
-     * 客户支付流水号
-     */
     private String paySerialNo;
 
-    /**
-     * 支付方式与bs_order订单表同步
-     */
     private Integer payType;
 
-    /**
-     * 订单状态
-0:待付款
-5:待出票
-10:已出票
-15:交易成功
--5:已取消
-     */
     private Integer status;
 
-    /**
-     * 创建时间
-     */
     private Date createTime;
 
-    /**
-     * 支付时间
-     */
     private Date payTime;
 
-    /**
-     * 取消时间
-     */
     private Date cancelTime;
 
-    /**
-     * 退款时间
-     */
     private Date refundTime;
 
-    /**
-     * 完成时间
-     */
     private Date finishTime;
 
-    /**
-     * 更新时间
-     */
     private Date updateTime;
 
-    /**
-     * 异常状态  0：正常  1：异常
-     */
     private Boolean exceptionStatus;
 
-    /**
-     * 异常内容
-     */
     private String exceptionMsg;
 
     private String ext1;
@@ -285,6 +183,14 @@ public class BsOrderCinema implements Serializable {
         this.goodsSpecsName = goodsSpecsName;
     }
 
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -516,6 +422,7 @@ public class BsOrderCinema implements Serializable {
             && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
             && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
             && (this.getGoodsSpecsName() == null ? other.getGoodsSpecsName() == null : this.getGoodsSpecsName().equals(other.getGoodsSpecsName()))
+            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
             && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
             && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo()))
             && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo()))
@@ -559,6 +466,7 @@ public class BsOrderCinema implements Serializable {
         result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
         result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
         result = prime * result + ((getGoodsSpecsName() == null) ? 0 : getGoodsSpecsName().hashCode());
+        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
         result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
         result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode());
         result = prime * result + ((getChannelOrderNo() == null) ? 0 : getChannelOrderNo().hashCode());
@@ -605,6 +513,7 @@ public class BsOrderCinema implements Serializable {
         sb.append(", img=").append(img);
         sb.append(", goodsName=").append(goodsName);
         sb.append(", goodsSpecsName=").append(goodsSpecsName);
+        sb.append(", platformCode=").append(platformCode);
         sb.append(", orderNo=").append(orderNo);
         sb.append(", childOrderNo=").append(childOrderNo);
         sb.append(", channelOrderNo=").append(channelOrderNo);
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java b/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java
index 6ebcc4b..d40bed8 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java
@@ -826,6 +826,76 @@ public class BsOrderCinemaExample {
             return (Criteria) this;
         }
 
+        public Criteria andPlatformCodeIsNull() {
+            addCriterion("platform_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIsNotNull() {
+            addCriterion("platform_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeEqualTo(String value) {
+            addCriterion("platform_code =", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotEqualTo(String value) {
+            addCriterion("platform_code <>", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThan(String value) {
+            addCriterion("platform_code >", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("platform_code >=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThan(String value) {
+            addCriterion("platform_code <", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
+            addCriterion("platform_code <=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLike(String value) {
+            addCriterion("platform_code like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotLike(String value) {
+            addCriterion("platform_code not like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIn(List<String> values) {
+            addCriterion("platform_code in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotIn(List<String> values) {
+            addCriterion("platform_code not in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeBetween(String value1, String value2) {
+            addCriterion("platform_code between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotBetween(String value1, String value2) {
+            addCriterion("platform_code not between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
         public Criteria andOrderNoIsNull() {
             addCriterion("order_no is null");
             return (Criteria) this;
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java b/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java
index 55e9c49..e94183f 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java
@@ -34,6 +34,11 @@ public class BsOrderCoupon implements Serializable {
      */
     private Long merId;
 
+    /**
+     * 登录平台code
+     */
+    private String platformCode;
+
     /**
      * 用户id
      */
@@ -89,6 +94,11 @@ public class BsOrderCoupon implements Serializable {
      */
     private BigDecimal goodsSpescOriginalPrice;
 
+    /**
+     * 商品规格销售价
+     */
+    private BigDecimal goodsSpescSalePrice;
+
     /**
      * 商品虚拟id
      */
@@ -224,6 +234,14 @@ public class BsOrderCoupon implements Serializable {
         this.merId = merId;
     }
 
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -312,6 +330,14 @@ public class BsOrderCoupon implements Serializable {
         this.goodsSpescOriginalPrice = goodsSpescOriginalPrice;
     }
 
+    public BigDecimal getGoodsSpescSalePrice() {
+        return goodsSpescSalePrice;
+    }
+
+    public void setGoodsSpescSalePrice(BigDecimal goodsSpescSalePrice) {
+        this.goodsSpescSalePrice = goodsSpescSalePrice;
+    }
+
     public Long getGoodsVpdId() {
         return goodsVpdId;
     }
@@ -504,6 +530,7 @@ public class BsOrderCoupon implements Serializable {
             && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
             && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo()))
             && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId()))
+            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
             && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
             && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone()))
             && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
@@ -515,6 +542,7 @@ public class BsOrderCoupon implements Serializable {
             && (this.getGoodsSpecsId() == null ? other.getGoodsSpecsId() == null : this.getGoodsSpecsId().equals(other.getGoodsSpecsId()))
             && (this.getGoodsSpecsName() == null ? other.getGoodsSpecsName() == null : this.getGoodsSpecsName().equals(other.getGoodsSpecsName()))
             && (this.getGoodsSpescOriginalPrice() == null ? other.getGoodsSpescOriginalPrice() == null : this.getGoodsSpescOriginalPrice().equals(other.getGoodsSpescOriginalPrice()))
+            && (this.getGoodsSpescSalePrice() == null ? other.getGoodsSpescSalePrice() == null : this.getGoodsSpescSalePrice().equals(other.getGoodsSpescSalePrice()))
             && (this.getGoodsVpdId() == null ? other.getGoodsVpdId() == null : this.getGoodsVpdId().equals(other.getGoodsVpdId()))
             && (this.getGoodsVpdKey() == null ? other.getGoodsVpdKey() == null : this.getGoodsVpdKey().equals(other.getGoodsVpdKey()))
             && (this.getGoodsVpdSource() == null ? other.getGoodsVpdSource() == null : this.getGoodsVpdSource().equals(other.getGoodsVpdSource()))
@@ -547,6 +575,7 @@ public class BsOrderCoupon implements Serializable {
         result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
         result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode());
         result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode());
+        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
         result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
         result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
@@ -558,6 +587,7 @@ public class BsOrderCoupon implements Serializable {
         result = prime * result + ((getGoodsSpecsId() == null) ? 0 : getGoodsSpecsId().hashCode());
         result = prime * result + ((getGoodsSpecsName() == null) ? 0 : getGoodsSpecsName().hashCode());
         result = prime * result + ((getGoodsSpescOriginalPrice() == null) ? 0 : getGoodsSpescOriginalPrice().hashCode());
+        result = prime * result + ((getGoodsSpescSalePrice() == null) ? 0 : getGoodsSpescSalePrice().hashCode());
         result = prime * result + ((getGoodsVpdId() == null) ? 0 : getGoodsVpdId().hashCode());
         result = prime * result + ((getGoodsVpdKey() == null) ? 0 : getGoodsVpdKey().hashCode());
         result = prime * result + ((getGoodsVpdSource() == null) ? 0 : getGoodsVpdSource().hashCode());
@@ -593,6 +623,7 @@ public class BsOrderCoupon implements Serializable {
         sb.append(", orderNo=").append(orderNo);
         sb.append(", childOrderNo=").append(childOrderNo);
         sb.append(", merId=").append(merId);
+        sb.append(", platformCode=").append(platformCode);
         sb.append(", userId=").append(userId);
         sb.append(", userPhone=").append(userPhone);
         sb.append(", goodsId=").append(goodsId);
@@ -604,6 +635,7 @@ public class BsOrderCoupon implements Serializable {
         sb.append(", goodsSpecsId=").append(goodsSpecsId);
         sb.append(", goodsSpecsName=").append(goodsSpecsName);
         sb.append(", goodsSpescOriginalPrice=").append(goodsSpescOriginalPrice);
+        sb.append(", goodsSpescSalePrice=").append(goodsSpescSalePrice);
         sb.append(", goodsVpdId=").append(goodsVpdId);
         sb.append(", goodsVpdKey=").append(goodsVpdKey);
         sb.append(", goodsVpdSource=").append(goodsVpdSource);
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java b/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java
index 67aab63..a9ea0de 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java
@@ -386,6 +386,76 @@ public class BsOrderCouponExample {
             return (Criteria) this;
         }
 
+        public Criteria andPlatformCodeIsNull() {
+            addCriterion("platform_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIsNotNull() {
+            addCriterion("platform_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeEqualTo(String value) {
+            addCriterion("platform_code =", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotEqualTo(String value) {
+            addCriterion("platform_code <>", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThan(String value) {
+            addCriterion("platform_code >", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("platform_code >=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThan(String value) {
+            addCriterion("platform_code <", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
+            addCriterion("platform_code <=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLike(String value) {
+            addCriterion("platform_code like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotLike(String value) {
+            addCriterion("platform_code not like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIn(List<String> values) {
+            addCriterion("platform_code in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotIn(List<String> values) {
+            addCriterion("platform_code not in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeBetween(String value1, String value2) {
+            addCriterion("platform_code between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotBetween(String value1, String value2) {
+            addCriterion("platform_code not between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
         public Criteria andUserIdIsNull() {
             addCriterion("user_id is null");
             return (Criteria) this;
@@ -1096,6 +1166,66 @@ public class BsOrderCouponExample {
             return (Criteria) this;
         }
 
+        public Criteria andGoodsSpescSalePriceIsNull() {
+            addCriterion("goods_spesc_sale_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceIsNotNull() {
+            addCriterion("goods_spesc_sale_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceEqualTo(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price =", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceNotEqualTo(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price <>", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceGreaterThan(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price >", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price >=", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceLessThan(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price <", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("goods_spesc_sale_price <=", value, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceIn(List<BigDecimal> values) {
+            addCriterion("goods_spesc_sale_price in", values, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceNotIn(List<BigDecimal> values) {
+            addCriterion("goods_spesc_sale_price not in", values, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("goods_spesc_sale_price between", value1, value2, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsSpescSalePriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("goods_spesc_sale_price not between", value1, value2, "goodsSpescSalePrice");
+            return (Criteria) this;
+        }
+
         public Criteria andGoodsVpdIdIsNull() {
             addCriterion("goods_vpd_id is null");
             return (Criteria) this;
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderGoods.java b/service/src/main/java/com/hfkj/entity/BsOrderGoods.java
index 25871e9..3034473 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderGoods.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderGoods.java
@@ -144,6 +144,11 @@ public class BsOrderGoods implements Serializable {
      */
     private Long integralDiscountPrice;
 
+    /**
+     * 登录平台code
+     */
+    private String platformCode;
+
     /**
      * 实付金额
      */
@@ -435,6 +440,14 @@ public class BsOrderGoods implements Serializable {
         this.integralDiscountPrice = integralDiscountPrice;
     }
 
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
     public BigDecimal getPayRealPrice() {
         return payRealPrice;
     }
@@ -617,6 +630,7 @@ public class BsOrderGoods implements Serializable {
             && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice()))
             && (this.getCouponDiscountPrice() == null ? other.getCouponDiscountPrice() == null : this.getCouponDiscountPrice().equals(other.getCouponDiscountPrice()))
             && (this.getIntegralDiscountPrice() == null ? other.getIntegralDiscountPrice() == null : this.getIntegralDiscountPrice().equals(other.getIntegralDiscountPrice()))
+            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
             && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice()))
             && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel()))
             && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo()))
@@ -667,6 +681,7 @@ public class BsOrderGoods implements Serializable {
         result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode());
         result = prime * result + ((getCouponDiscountPrice() == null) ? 0 : getCouponDiscountPrice().hashCode());
         result = prime * result + ((getIntegralDiscountPrice() == null) ? 0 : getIntegralDiscountPrice().hashCode());
+        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
         result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
         result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode());
         result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode());
@@ -720,6 +735,7 @@ public class BsOrderGoods implements Serializable {
         sb.append(", totalDeductionPrice=").append(totalDeductionPrice);
         sb.append(", couponDiscountPrice=").append(couponDiscountPrice);
         sb.append(", integralDiscountPrice=").append(integralDiscountPrice);
+        sb.append(", platformCode=").append(platformCode);
         sb.append(", payRealPrice=").append(payRealPrice);
         sb.append(", payChannel=").append(payChannel);
         sb.append(", paySerialNo=").append(paySerialNo);
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java b/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java
index 11b275c..e88b952 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java
@@ -1796,6 +1796,76 @@ public class BsOrderGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andPlatformCodeIsNull() {
+            addCriterion("platform_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIsNotNull() {
+            addCriterion("platform_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeEqualTo(String value) {
+            addCriterion("platform_code =", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotEqualTo(String value) {
+            addCriterion("platform_code <>", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThan(String value) {
+            addCriterion("platform_code >", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("platform_code >=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThan(String value) {
+            addCriterion("platform_code <", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
+            addCriterion("platform_code <=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLike(String value) {
+            addCriterion("platform_code like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotLike(String value) {
+            addCriterion("platform_code not like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIn(List<String> values) {
+            addCriterion("platform_code in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotIn(List<String> values) {
+            addCriterion("platform_code not in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeBetween(String value1, String value2) {
+            addCriterion("platform_code between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotBetween(String value1, String value2) {
+            addCriterion("platform_code not between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
         public Criteria andPayRealPriceIsNull() {
             addCriterion("pay_real_price is null");
             return (Criteria) this;
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java
index 4851d73..19ff7d3 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java
@@ -18,6 +18,11 @@ public class BsOrderStarbucks implements Serializable {
 
     private String storeCode;
 
+    /**
+     * 登录平台code
+     */
+    private String platformCode;
+
     private String platformUniqueId;
 
     private Integer productId;
@@ -94,6 +99,14 @@ public class BsOrderStarbucks implements Serializable {
         this.storeCode = storeCode;
     }
 
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
     public String getPlatformUniqueId() {
         return platformUniqueId;
     }
@@ -316,6 +329,7 @@ public class BsOrderStarbucks implements Serializable {
         BsOrderStarbucks other = (BsOrderStarbucks) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getStoreCode() == null ? other.getStoreCode() == null : this.getStoreCode().equals(other.getStoreCode()))
+            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
             && (this.getPlatformUniqueId() == null ? other.getPlatformUniqueId() == null : this.getPlatformUniqueId().equals(other.getPlatformUniqueId()))
             && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
             && (this.getCupSize() == null ? other.getCupSize() == null : this.getCupSize().equals(other.getCupSize()))
@@ -350,6 +364,7 @@ public class BsOrderStarbucks implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getStoreCode() == null) ? 0 : getStoreCode().hashCode());
+        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
         result = prime * result + ((getPlatformUniqueId() == null) ? 0 : getPlatformUniqueId().hashCode());
         result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
         result = prime * result + ((getCupSize() == null) ? 0 : getCupSize().hashCode());
@@ -387,6 +402,7 @@ public class BsOrderStarbucks implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", storeCode=").append(storeCode);
+        sb.append(", platformCode=").append(platformCode);
         sb.append(", platformUniqueId=").append(platformUniqueId);
         sb.append(", productId=").append(productId);
         sb.append(", cupSize=").append(cupSize);
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java
index ab1d896..c1ce216 100644
--- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java
+++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java
@@ -256,6 +256,76 @@ public class BsOrderStarbucksExample {
             return (Criteria) this;
         }
 
+        public Criteria andPlatformCodeIsNull() {
+            addCriterion("platform_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIsNotNull() {
+            addCriterion("platform_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeEqualTo(String value) {
+            addCriterion("platform_code =", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotEqualTo(String value) {
+            addCriterion("platform_code <>", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThan(String value) {
+            addCriterion("platform_code >", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("platform_code >=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThan(String value) {
+            addCriterion("platform_code <", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
+            addCriterion("platform_code <=", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeLike(String value) {
+            addCriterion("platform_code like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotLike(String value) {
+            addCriterion("platform_code not like", value, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeIn(List<String> values) {
+            addCriterion("platform_code in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotIn(List<String> values) {
+            addCriterion("platform_code not in", values, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeBetween(String value1, String value2) {
+            addCriterion("platform_code between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformCodeNotBetween(String value1, String value2) {
+            addCriterion("platform_code not between", value1, value2, "platformCode");
+            return (Criteria) this;
+        }
+
         public Criteria andPlatformUniqueIdIsNull() {
             addCriterion("platform_unique_id is null");
             return (Criteria) this;