Changes

order/src/main/java/com/order/controller/OrderController.java

@@ -74,7 +74,7 @@ public class OrderController {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
                 }
 
-                if (orderChild.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())
+                if (orderChild.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())
                     && orderChild.getProductSpecId() == null) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
                 }

service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java

@@ -0,0 +1,234 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrderGoods;
+import com.hfkj.entity.BsOrderGoodsExample;
+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;
+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;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt {
+    @SelectProvider(type=BsOrderGoodsSqlProvider.class, method="countByExample")
+    long countByExample(BsOrderGoodsExample example);
+
+    @DeleteProvider(type=BsOrderGoodsSqlProvider.class, method="deleteByExample")
+    int deleteByExample(BsOrderGoodsExample example);
+
+    @Delete({
+        "delete from bs_order_goods",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into bs_order_goods (logistics_no, freight_price, ",
+        "delivery_address_id, delivery_address, ",
+        "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_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 (#{logisticsNo,jdbcType=VARCHAR}, #{freightPrice,jdbcType=DECIMAL}, ",
+        "#{deliveryAddressId,jdbcType=BIGINT}, #{deliveryAddress,jdbcType=VARCHAR}, ",
+        "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
+        "#{merId,jdbcType=BIGINT}, #{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}, #{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(BsOrderGoods record);
+
+    @InsertProvider(type=BsOrderGoodsSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(BsOrderGoods record);
+
+    @SelectProvider(type=BsOrderGoodsSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT),
+        @Result(column="delivery_address", property="deliveryAddress", jdbcType=JdbcType.VARCHAR),
+        @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="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),
+        @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_brand_id", property="goodsBrandId", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR),
+        @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_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+        @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="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)
+    })
+    List<BsOrderGoods> selectByExample(BsOrderGoodsExample example);
+
+    @Select({
+        "select",
+        "id, logistics_no, freight_price, delivery_address_id, delivery_address, 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_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_goods",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT),
+        @Result(column="delivery_address", property="deliveryAddress", jdbcType=JdbcType.VARCHAR),
+        @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="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),
+        @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_brand_id", property="goodsBrandId", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR),
+        @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_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+        @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="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)
+    })
+    BsOrderGoods selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=BsOrderGoodsSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") BsOrderGoods record, @Param("example") BsOrderGoodsExample example);
+
+    @UpdateProvider(type=BsOrderGoodsSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") BsOrderGoods record, @Param("example") BsOrderGoodsExample example);
+
+    @UpdateProvider(type=BsOrderGoodsSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(BsOrderGoods record);
+
+    @Update({
+        "update bs_order_goods",
+        "set logistics_no = #{logisticsNo,jdbcType=VARCHAR},",
+          "freight_price = #{freightPrice,jdbcType=DECIMAL},",
+          "delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT},",
+          "delivery_address = #{deliveryAddress,jdbcType=VARCHAR},",
+          "order_no = #{orderNo,jdbcType=VARCHAR},",
+          "child_order_no = #{childOrderNo,jdbcType=VARCHAR},",
+          "mer_id = #{merId,jdbcType=BIGINT},",
+          "user_id = #{userId,jdbcType=BIGINT},",
+          "user_phone = #{userPhone,jdbcType=VARCHAR},",
+          "goods_id = #{goodsId,jdbcType=BIGINT},",
+          "goods_name = #{goodsName,jdbcType=VARCHAR},",
+          "goods_type_id = #{goodsTypeId,jdbcType=BIGINT},",
+          "goods_type_name = #{goodsTypeName,jdbcType=VARCHAR},",
+          "goods_brand_id = #{goodsBrandId,jdbcType=BIGINT},",
+          "goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR},",
+          "goods_specs_id = #{goodsSpecsId,jdbcType=BIGINT},",
+          "goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR},",
+          "goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL},",
+          "goods_count = #{goodsCount,jdbcType=INTEGER},",
+          "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},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(BsOrderGoods record);
+}

service/src/main/java/com/hfkj/dao/BsOrderGoodsMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface BsOrderGoodsMapperExt {
+}

service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java

@@ -0,0 +1,696 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrderGoods;
+import com.hfkj.entity.BsOrderGoodsExample.Criteria;
+import com.hfkj.entity.BsOrderGoodsExample.Criterion;
+import com.hfkj.entity.BsOrderGoodsExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class BsOrderGoodsSqlProvider {
+
+    public String countByExample(BsOrderGoodsExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("bs_order_goods");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(BsOrderGoodsExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("bs_order_goods");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(BsOrderGoods record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("bs_order_goods");
+        
+        if (record.getLogisticsNo() != null) {
+            sql.VALUES("logistics_no", "#{logisticsNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFreightPrice() != null) {
+            sql.VALUES("freight_price", "#{freightPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getDeliveryAddressId() != null) {
+            sql.VALUES("delivery_address_id", "#{deliveryAddressId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDeliveryAddress() != null) {
+            sql.VALUES("delivery_address", "#{deliveryAddress,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getChildOrderNo() != null) {
+            sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserPhone() != null) {
+            sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsId() != null) {
+            sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsTypeId() != null) {
+            sql.VALUES("goods_type_id", "#{goodsTypeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsTypeName() != null) {
+            sql.VALUES("goods_type_name", "#{goodsTypeName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsBrandId() != null) {
+            sql.VALUES("goods_brand_id", "#{goodsBrandId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsBrandName() != null) {
+            sql.VALUES("goods_brand_name", "#{goodsBrandName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpecsId() != null) {
+            sql.VALUES("goods_specs_id", "#{goodsSpecsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsSpecsName() != null) {
+            sql.VALUES("goods_specs_name", "#{goodsSpecsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpescOriginalPrice() != null) {
+            sql.VALUES("goods_spesc_original_price", "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTotalDeductionPrice() != null) {
+            sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCouponDiscountPrice() != null) {
+            sql.VALUES("coupon_discount_price", "#{couponDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIntegralDiscountPrice() != null) {
+            sql.VALUES("integral_discount_price", "#{integralDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayRealPrice() != null) {
+            sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayChannel() != null) {
+            sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPaySerialNo() != null) {
+            sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayType() != null) {
+            sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getPayTime() != null) {
+            sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCancelTime() != null) {
+            sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getRefundTime() != null) {
+            sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getFinishTime() != null) {
+            sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(BsOrderGoodsExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("logistics_no");
+        sql.SELECT("freight_price");
+        sql.SELECT("delivery_address_id");
+        sql.SELECT("delivery_address");
+        sql.SELECT("order_no");
+        sql.SELECT("child_order_no");
+        sql.SELECT("mer_id");
+        sql.SELECT("user_id");
+        sql.SELECT("user_phone");
+        sql.SELECT("goods_id");
+        sql.SELECT("goods_name");
+        sql.SELECT("goods_type_id");
+        sql.SELECT("goods_type_name");
+        sql.SELECT("goods_brand_id");
+        sql.SELECT("goods_brand_name");
+        sql.SELECT("goods_specs_id");
+        sql.SELECT("goods_specs_name");
+        sql.SELECT("goods_spesc_original_price");
+        sql.SELECT("goods_count");
+        sql.SELECT("total_price");
+        sql.SELECT("total_deduction_price");
+        sql.SELECT("coupon_discount_price");
+        sql.SELECT("integral_discount_price");
+        sql.SELECT("pay_real_price");
+        sql.SELECT("pay_channel");
+        sql.SELECT("pay_serial_no");
+        sql.SELECT("pay_type");
+        sql.SELECT("`status`");
+        sql.SELECT("create_time");
+        sql.SELECT("pay_time");
+        sql.SELECT("cancel_time");
+        sql.SELECT("refund_time");
+        sql.SELECT("finish_time");
+        sql.SELECT("update_time");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("bs_order_goods");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        BsOrderGoods record = (BsOrderGoods) parameter.get("record");
+        BsOrderGoodsExample example = (BsOrderGoodsExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_goods");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getLogisticsNo() != null) {
+            sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFreightPrice() != null) {
+            sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getDeliveryAddressId() != null) {
+            sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDeliveryAddress() != null) {
+            sql.SET("delivery_address = #{record.deliveryAddress,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getChildOrderNo() != null) {
+            sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserPhone() != null) {
+            sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsId() != null) {
+            sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsTypeId() != null) {
+            sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsTypeName() != null) {
+            sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsBrandId() != null) {
+            sql.SET("goods_brand_id = #{record.goodsBrandId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsBrandName() != null) {
+            sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpecsId() != null) {
+            sql.SET("goods_specs_id = #{record.goodsSpecsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsSpecsName() != null) {
+            sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpescOriginalPrice() != null) {
+            sql.SET("goods_spesc_original_price = #{record.goodsSpescOriginalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTotalDeductionPrice() != null) {
+            sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCouponDiscountPrice() != null) {
+            sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIntegralDiscountPrice() != null) {
+            sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayRealPrice() != null) {
+            sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayChannel() != null) {
+            sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPaySerialNo() != null) {
+            sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayType() != null) {
+            sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getPayTime() != null) {
+            sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCancelTime() != null) {
+            sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getRefundTime() != null) {
+            sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getFinishTime() != null) {
+            sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_goods");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}");
+        sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}");
+        sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}");
+        sql.SET("delivery_address = #{record.deliveryAddress,jdbcType=VARCHAR}");
+        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("user_id = #{record.userId,jdbcType=BIGINT}");
+        sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
+        sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
+        sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+        sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=BIGINT}");
+        sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}");
+        sql.SET("goods_brand_id = #{record.goodsBrandId,jdbcType=BIGINT}");
+        sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}");
+        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_count = #{record.goodsCount,jdbcType=INTEGER}");
+        sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        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("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
+        sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
+        sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
+        sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
+        sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
+        sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
+        sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        BsOrderGoodsExample example = (BsOrderGoodsExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(BsOrderGoods record) {
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_goods");
+        
+        if (record.getLogisticsNo() != null) {
+            sql.SET("logistics_no = #{logisticsNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFreightPrice() != null) {
+            sql.SET("freight_price = #{freightPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getDeliveryAddressId() != null) {
+            sql.SET("delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDeliveryAddress() != null) {
+            sql.SET("delivery_address = #{deliveryAddress,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.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.getGoodsId() != null) {
+            sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsTypeId() != null) {
+            sql.SET("goods_type_id = #{goodsTypeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsTypeName() != null) {
+            sql.SET("goods_type_name = #{goodsTypeName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsBrandId() != null) {
+            sql.SET("goods_brand_id = #{goodsBrandId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsBrandName() != null) {
+            sql.SET("goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpecsId() != null) {
+            sql.SET("goods_specs_id = #{goodsSpecsId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGoodsSpecsName() != null) {
+            sql.SET("goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsSpescOriginalPrice() != null) {
+            sql.SET("goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}");
+        }
+        
+        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.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, BsOrderGoodsExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/entity/BsOrderGoods.java

@@ -0,0 +1,649 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * bs_order_goods
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class BsOrderGoods implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 物流号
+     */
+    private String logisticsNo;
+
+    /**
+     * 运费
+     */
+    private BigDecimal freightPrice;
+
+    /**
+     * 收货地址编码
+     */
+    private Long deliveryAddressId;
+
+    /**
+     * 收货地址
+     */
+    private String deliveryAddress;
+
+    /**
+     * 交易订单号
+     */
+    private String orderNo;
+
+    /**
+     * 子订单号
+     */
+    private String childOrderNo;
+
+    /**
+     * 商户id
+     */
+    private Long merId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户手机号
+     */
+    private String userPhone;
+
+    /**
+     * 商品id
+     */
+    private Long goodsId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品类型id
+     */
+    private Long goodsTypeId;
+
+    /**
+     * 商品类型名称
+     */
+    private String goodsTypeName;
+
+    /**
+     * 商品品牌id
+     */
+    private Long goodsBrandId;
+
+    /**
+     * 商品品牌名称
+     */
+    private String goodsBrandName;
+
+    /**
+     * 商品规格id
+     */
+    private Long goodsSpecsId;
+
+    /**
+     * 商品规格名称
+     */
+    private String goodsSpecsName;
+
+    /**
+     * 商品规格原价
+     */
+    private BigDecimal goodsSpescOriginalPrice;
+
+    /**
+     * 商品数量
+     */
+    private Integer goodsCount;
+
+    /**
+     * 交易金额
+     */
+    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;
+
+    /**
+     * 状态与子订单状态同步
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     * 取消时间
+     */
+    private Date cancelTime;
+
+    /**
+     * 退款时间
+     */
+    private Date refundTime;
+
+    /**
+     * 完成时间
+     */
+    private Date finishTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLogisticsNo() {
+        return logisticsNo;
+    }
+
+    public void setLogisticsNo(String logisticsNo) {
+        this.logisticsNo = logisticsNo;
+    }
+
+    public BigDecimal getFreightPrice() {
+        return freightPrice;
+    }
+
+    public void setFreightPrice(BigDecimal freightPrice) {
+        this.freightPrice = freightPrice;
+    }
+
+    public Long getDeliveryAddressId() {
+        return deliveryAddressId;
+    }
+
+    public void setDeliveryAddressId(Long deliveryAddressId) {
+        this.deliveryAddressId = deliveryAddressId;
+    }
+
+    public String getDeliveryAddress() {
+        return deliveryAddress;
+    }
+
+    public void setDeliveryAddress(String deliveryAddress) {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getChildOrderNo() {
+        return childOrderNo;
+    }
+
+    public void setChildOrderNo(String childOrderNo) {
+        this.childOrderNo = childOrderNo;
+    }
+
+    public Long getMerId() {
+        return merId;
+    }
+
+    public void setMerId(Long merId) {
+        this.merId = merId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Long getGoodsTypeId() {
+        return goodsTypeId;
+    }
+
+    public void setGoodsTypeId(Long goodsTypeId) {
+        this.goodsTypeId = goodsTypeId;
+    }
+
+    public String getGoodsTypeName() {
+        return goodsTypeName;
+    }
+
+    public void setGoodsTypeName(String goodsTypeName) {
+        this.goodsTypeName = goodsTypeName;
+    }
+
+    public Long getGoodsBrandId() {
+        return goodsBrandId;
+    }
+
+    public void setGoodsBrandId(Long goodsBrandId) {
+        this.goodsBrandId = goodsBrandId;
+    }
+
+    public String getGoodsBrandName() {
+        return goodsBrandName;
+    }
+
+    public void setGoodsBrandName(String goodsBrandName) {
+        this.goodsBrandName = goodsBrandName;
+    }
+
+    public Long getGoodsSpecsId() {
+        return goodsSpecsId;
+    }
+
+    public void setGoodsSpecsId(Long goodsSpecsId) {
+        this.goodsSpecsId = goodsSpecsId;
+    }
+
+    public String getGoodsSpecsName() {
+        return goodsSpecsName;
+    }
+
+    public void setGoodsSpecsName(String goodsSpecsName) {
+        this.goodsSpecsName = goodsSpecsName;
+    }
+
+    public BigDecimal getGoodsSpescOriginalPrice() {
+        return goodsSpescOriginalPrice;
+    }
+
+    public void setGoodsSpescOriginalPrice(BigDecimal goodsSpescOriginalPrice) {
+        this.goodsSpescOriginalPrice = goodsSpescOriginalPrice;
+    }
+
+    public Integer getGoodsCount() {
+        return goodsCount;
+    }
+
+    public void setGoodsCount(Integer goodsCount) {
+        this.goodsCount = goodsCount;
+    }
+
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public BigDecimal getTotalDeductionPrice() {
+        return totalDeductionPrice;
+    }
+
+    public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) {
+        this.totalDeductionPrice = totalDeductionPrice;
+    }
+
+    public BigDecimal getCouponDiscountPrice() {
+        return couponDiscountPrice;
+    }
+
+    public void setCouponDiscountPrice(BigDecimal couponDiscountPrice) {
+        this.couponDiscountPrice = couponDiscountPrice;
+    }
+
+    public Long getIntegralDiscountPrice() {
+        return integralDiscountPrice;
+    }
+
+    public void setIntegralDiscountPrice(Long integralDiscountPrice) {
+        this.integralDiscountPrice = integralDiscountPrice;
+    }
+
+    public BigDecimal getPayRealPrice() {
+        return payRealPrice;
+    }
+
+    public void setPayRealPrice(BigDecimal payRealPrice) {
+        this.payRealPrice = payRealPrice;
+    }
+
+    public Integer getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(Integer payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public String getPaySerialNo() {
+        return paySerialNo;
+    }
+
+    public void setPaySerialNo(String paySerialNo) {
+        this.paySerialNo = paySerialNo;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        BsOrderGoods other = (BsOrderGoods) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getLogisticsNo() == null ? other.getLogisticsNo() == null : this.getLogisticsNo().equals(other.getLogisticsNo()))
+            && (this.getFreightPrice() == null ? other.getFreightPrice() == null : this.getFreightPrice().equals(other.getFreightPrice()))
+            && (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId()))
+            && (this.getDeliveryAddress() == null ? other.getDeliveryAddress() == null : this.getDeliveryAddress().equals(other.getDeliveryAddress()))
+            && (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.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()))
+            && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
+            && (this.getGoodsTypeId() == null ? other.getGoodsTypeId() == null : this.getGoodsTypeId().equals(other.getGoodsTypeId()))
+            && (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName()))
+            && (this.getGoodsBrandId() == null ? other.getGoodsBrandId() == null : this.getGoodsBrandId().equals(other.getGoodsBrandId()))
+            && (this.getGoodsBrandName() == null ? other.getGoodsBrandName() == null : this.getGoodsBrandName().equals(other.getGoodsBrandName()))
+            && (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.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
+            && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
+            && (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.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()))
+            && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
+            && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime()))
+            && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
+            && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getLogisticsNo() == null) ? 0 : getLogisticsNo().hashCode());
+        result = prime * result + ((getFreightPrice() == null) ? 0 : getFreightPrice().hashCode());
+        result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode());
+        result = prime * result + ((getDeliveryAddress() == null) ? 0 : getDeliveryAddress().hashCode());
+        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 + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
+        result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
+        result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
+        result = prime * result + ((getGoodsTypeId() == null) ? 0 : getGoodsTypeId().hashCode());
+        result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode());
+        result = prime * result + ((getGoodsBrandId() == null) ? 0 : getGoodsBrandId().hashCode());
+        result = prime * result + ((getGoodsBrandName() == null) ? 0 : getGoodsBrandName().hashCode());
+        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 + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
+        result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
+        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 + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
+        result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode());
+        result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode());
+        result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
+        result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode());
+        result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
+        result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", logisticsNo=").append(logisticsNo);
+        sb.append(", freightPrice=").append(freightPrice);
+        sb.append(", deliveryAddressId=").append(deliveryAddressId);
+        sb.append(", deliveryAddress=").append(deliveryAddress);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", childOrderNo=").append(childOrderNo);
+        sb.append(", merId=").append(merId);
+        sb.append(", userId=").append(userId);
+        sb.append(", userPhone=").append(userPhone);
+        sb.append(", goodsId=").append(goodsId);
+        sb.append(", goodsName=").append(goodsName);
+        sb.append(", goodsTypeId=").append(goodsTypeId);
+        sb.append(", goodsTypeName=").append(goodsTypeName);
+        sb.append(", goodsBrandId=").append(goodsBrandId);
+        sb.append(", goodsBrandName=").append(goodsBrandName);
+        sb.append(", goodsSpecsId=").append(goodsSpecsId);
+        sb.append(", goodsSpecsName=").append(goodsSpecsName);
+        sb.append(", goodsSpescOriginalPrice=").append(goodsSpescOriginalPrice);
+        sb.append(", goodsCount=").append(goodsCount);
+        sb.append(", totalPrice=").append(totalPrice);
+        sb.append(", totalDeductionPrice=").append(totalDeductionPrice);
+        sb.append(", couponDiscountPrice=").append(couponDiscountPrice);
+        sb.append(", integralDiscountPrice=").append(integralDiscountPrice);
+        sb.append(", payRealPrice=").append(payRealPrice);
+        sb.append(", payChannel=").append(payChannel);
+        sb.append(", paySerialNo=").append(paySerialNo);
+        sb.append(", payType=").append(payType);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", payTime=").append(payTime);
+        sb.append(", cancelTime=").append(cancelTime);
+        sb.append(", refundTime=").append(refundTime);
+        sb.append(", finishTime=").append(finishTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/service/goods/BsOrderGoodsService.java

@@ -0,0 +1,69 @@
+package com.hfkj.service.goods;
+
+import com.hfkj.entity.BsOrderGoods;
+import com.hfkj.entity.GoodsBrand;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BsOrderGoodsService {
+    /**
+     * @Author Sum1Dream
+     * @Name create
+     * @Description // 创建
+     * @Date 15:11 2024/4/19
+     * @Param GoodsBrand
+     * @return void
+     */
+    void create(BsOrderGoods orderGoods);
+
+    /**
+     * @Author Sum1Dream
+     * @Name update
+     * @Description // 修改
+     * @Date 15:12 2024/4/19
+     * @Param GoodsBrand
+     * @return void
+     */
+    void update(BsOrderGoods orderGoods);
+
+    /**
+     * @Author Sum1Dream
+     * @Name delete
+     * @Description // 修改
+     * @Date 15:12 2024/4/19
+     * @Param id
+     * @return void
+     */
+    void delete(Long id , Boolean fullDelete);
+
+    /**
+     * @Author Sum1Dream
+     * @Name queryDetail
+     * @Description // 根据ID查询产品类型详情
+     * @Date 15:12 2024/4/19
+     * @Param id
+     * @return com.hfkj.entity.GoodsBrand
+     */
+    BsOrderGoods queryDetail(Long id);
+
+    /**
+     * @Author Sum1Dream
+     * @Name queryDetailByMap
+     * @Description // 根据多条件查询产品类型
+     * @Date 15:12 2024/4/19
+     * @Param map
+     * @return com.hfkj.entity.GoodsBrand
+     */
+    BsOrderGoods queryDetailByMap(Map<String , Object> map);
+
+    /**
+     * @Author Sum1Dream
+     * @Name getList
+     * @Description // 根据多条件查询列表
+     * @Date 15:13 2024/4/19
+     * @Param map
+     * @return java.util.List<com.hfkj.entity.GoodsBrand>
+     */
+    List<BsOrderGoods> getList(Map<String , Object> map);
+}

service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java

@@ -0,0 +1,56 @@
+package com.hfkj.service.goods.impl;
+
+import com.hfkj.dao.BsOrderGoodsMapper;
+import com.hfkj.entity.BsOrderGoods;
+import com.hfkj.service.goods.BsOrderGoodsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service("bsOrderGoodsService")
+public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
+
+    @Resource
+    private BsOrderGoodsMapper bsOrderGoodsMapper;
+
+    @Override
+    public void create(BsOrderGoods orderGoods) {
+        bsOrderGoodsMapper.insert(orderGoods);
+    }
+
+    @Override
+    public void update(BsOrderGoods orderGoods) {
+        bsOrderGoodsMapper.updateByPrimaryKeySelective(orderGoods);
+    }
+
+    @Override
+    public void delete(Long id, Boolean fullDelete) {
+        if (fullDelete) {
+            bsOrderGoodsMapper.deleteByPrimaryKey(id);
+        } else {
+            BsOrderGoods orderGoods = queryDetail(id);
+            orderGoods.setStatus(0);
+            orderGoods.setUpdateTime(new Date());
+            update(orderGoods);
+        }
+    }
+
+    @Override
+    public BsOrderGoods queryDetail(Long id) {
+        return bsOrderGoodsMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public BsOrderGoods queryDetailByMap(Map<String, Object> map) {
+        return null;
+    }
+
+    @Override
+    public List<BsOrderGoods> getList(Map<String, Object> map) {
+        return Collections.emptyList();
+    }
+}

service/src/main/java/com/hfkj/service/order/OrderCancelService.java

@@ -50,7 +50,7 @@ public class OrderCancelService {
     @Transactional(propagation = Propagation.NOT_SUPPORTED, isolation = Isolation.READ_UNCOMMITTED)
     public void orderBusHandle(OrderModel order) {
         for (OrderChildModel childOrder : order.getOrderChildList()) {
-            if (childOrder.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())) {
+            if (childOrder.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())) {
                 product(childOrder);
             }
         }

service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java

@@ -61,7 +61,7 @@ public class OrderPaySuccessService {
     public void orderBusHandle(OrderModel order) {
         for (BsOrderChild childOrder : order.getOrderChildList()) {
             try {
-                if (childOrder.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())) {
+                if (childOrder.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())) {
                     product(order, childOrder);
                 }
              } catch (Exception e) {

service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@@ -168,7 +168,7 @@ public class BsOrderServiceImpl implements BsOrderService {
             child.setChildOrderNo(order.getId()+RandomUtils.number(4, false));
 
             // 提交订单前产品处理
-            if (child.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())) {
+            if (child.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())) {
                 child = orderCreateService.product(order, child);
             }
             child.setProductTotalPrice(child.getProductPrice().multiply(new BigDecimal(child.getProductCount().toString())));

service/src/main/java/com/hfkj/sysenum/order/OrderChildProductTypeEnum.java

@@ -9,7 +9,8 @@ public enum OrderChildProductTypeEnum {
     /**
      * 产品
      */
-    type1(1, "产品"),
+    type1(1, "实物产品"),
+    type2(2, "虚拟产品"),
     ;
 
     private int code;