diff --git a/cweb/pom.xml b/cweb/pom.xml
index 69db753..882d490 100644
--- a/cweb/pom.xml
+++ b/cweb/pom.xml
@@ -40,6 +40,13 @@
src/main/resources/${env}
false
+
+ ${basedir}/lib
+ BOOT-INF/lib/
+
+ **/*.jar
+
+
diff --git a/cweb/src/main/java/com/hfkj/controller/GoodsController.java b/cweb/src/main/java/com/hfkj/controller/GoodsController.java
index 6244512..42c1c21 100644
--- a/cweb/src/main/java/com/hfkj/controller/GoodsController.java
+++ b/cweb/src/main/java/com/hfkj/controller/GoodsController.java
@@ -43,7 +43,7 @@ public class GoodsController {
) {
try {
- List goodsList = new ArrayList<>();
+ List goodsList;
// 1:淘宝 2:拼多多
if (type == 1) {
@@ -55,11 +55,24 @@ public class GoodsController {
goodsList = goodsDataService.goodsModelTaoBaoList(jsonObject);
} else if (type == 2) {
- if (pageSize < 10) {
- throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR , "pageSize的取值范围是10-100！");
+ JSONObject object = PddService.authority();
+ boolean generateAuthorityUrl = object.getJSONObject("authorityQueryResponse").getInteger("bind") == 0;
+ if (!generateAuthorityUrl && title != null) {
+ goodsList = new ArrayList<>();
+ JSONObject jsonObject = PddService.promotion();
+ JSONObject promotion = jsonObject.getJSONObject("rpPromotionUrlGenerateResponse").getJSONArray("urlList").getJSONObject(0);
+ GoodsModel goodsModel = new GoodsModel();
+ goodsModel.setPddUrl(promotion);
+ goodsList.add(goodsModel);
+
+ } else {
+ if (pageSize < 10) {
+ throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR , "pageSize的取值范围是10-100！");
+ }
+ JSONObject jsonObject = PddService.syncInvoke(title , pageNo , pageSize);
+ goodsList = goodsDataService.goodsModelPddList(jsonObject);
}
- JSONObject jsonObject = PddService.syncInvoke(title , pageNo , pageSize);
- return ResponseMsgUtil.success(jsonObject);
+
} else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR , "未知类型！");
}
@@ -105,7 +118,7 @@ public class GoodsController {
boolean generateAuthorityUrl = object.getJSONObject("authorityQueryResponse").getInteger("bind") == 0;
JSONObject jsonObject = PddService.promotion(searchId , goodsSign , generateAuthorityUrl);
- return ResponseMsgUtil.success(jsonObject);
+ return ResponseMsgUtil.success(jsonObject.getJSONObject("goodsPromotionUrlGenerateResponse").getJSONArray("goodsPromotionUrlList").getJSONObject(0));
} catch (Exception e) {
log.error("error!",e);
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMapper.java
new file mode 100644
index 0000000..9c31855
--- /dev/null
+++ b/service/src/main/java/com/hfkj/dao/BsOrderMapper.java
@@ -0,0 +1,163 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrder;
+import com.hfkj.entity.BsOrderExample;
+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 BsOrderMapper extends BsOrderMapperExt {
+ @SelectProvider(type=BsOrderSqlProvider.class, method="countByExample")
+ long countByExample(BsOrderExample example);
+
+ @DeleteProvider(type=BsOrderSqlProvider.class, method="deleteByExample")
+ int deleteByExample(BsOrderExample example);
+
+ @Delete({
+ "delete from bs_order",
+ "where id = #{id,jdbcType=BIGINT}"
+ })
+ int deleteByPrimaryKey(Long id);
+
+ @Insert({
+ "insert into bs_order (order_no, user_id, ",
+ "user_phone, img, ",
+ "goods_name, customParameters, ",
+ "goods_count, `type`, ",
+ "total_price, promotionAmount, ",
+ "`status`, create_time, ",
+ "pay_time, cancel_time, ",
+ "refund_time, finish_time, ",
+ "update_time, ext_1, ",
+ "ext_2, ext_3)",
+ "values (#{orderNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
+ "#{userPhone,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ",
+ "#{goodsName,jdbcType=VARCHAR}, #{customparameters,jdbcType=VARCHAR}, ",
+ "#{goodsCount,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, ",
+ "#{totalPrice,jdbcType=DECIMAL}, #{promotionamount,jdbcType=DECIMAL}, ",
+ "#{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(BsOrder record);
+
+ @InsertProvider(type=BsOrderSqlProvider.class, method="insertSelective")
+ @Options(useGeneratedKeys=true,keyProperty="id")
+ int insertSelective(BsOrder record);
+
+ @SelectProvider(type=BsOrderSqlProvider.class, method="selectByExample")
+ @Results({
+ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+ @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+ @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+ @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
+ @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
+ @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+ @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR),
+ @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+ @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+ @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+ @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
+ @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 selectByExample(BsOrderExample example);
+
+ @Select({
+ "select",
+ "id, order_no, user_id, user_phone, img, goods_name, customParameters, goods_count, ",
+ "`type`, total_price, promotionAmount, `status`, create_time, pay_time, cancel_time, ",
+ "refund_time, finish_time, update_time, ext_1, ext_2, ext_3",
+ "from bs_order",
+ "where id = #{id,jdbcType=BIGINT}"
+ })
+ @Results({
+ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+ @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+ @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+ @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
+ @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
+ @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+ @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR),
+ @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+ @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+ @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+ @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
+ @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)
+ })
+ BsOrder selectByPrimaryKey(Long id);
+
+ @UpdateProvider(type=BsOrderSqlProvider.class, method="updateByExampleSelective")
+ int updateByExampleSelective(@Param("record") BsOrder record, @Param("example") BsOrderExample example);
+
+ @UpdateProvider(type=BsOrderSqlProvider.class, method="updateByExample")
+ int updateByExample(@Param("record") BsOrder record, @Param("example") BsOrderExample example);
+
+ @UpdateProvider(type=BsOrderSqlProvider.class, method="updateByPrimaryKeySelective")
+ int updateByPrimaryKeySelective(BsOrder record);
+
+ @Update({
+ "update bs_order",
+ "set order_no = #{orderNo,jdbcType=VARCHAR},",
+ "user_id = #{userId,jdbcType=BIGINT},",
+ "user_phone = #{userPhone,jdbcType=VARCHAR},",
+ "img = #{img,jdbcType=VARCHAR},",
+ "goods_name = #{goodsName,jdbcType=VARCHAR},",
+ "customParameters = #{customparameters,jdbcType=VARCHAR},",
+ "goods_count = #{goodsCount,jdbcType=INTEGER},",
+ "`type` = #{type,jdbcType=INTEGER},",
+ "total_price = #{totalPrice,jdbcType=DECIMAL},",
+ "promotionAmount = #{promotionamount,jdbcType=DECIMAL},",
+ "`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(BsOrder record);
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsOrderMapperExt.java
new file mode 100644
index 0000000..08c462e
--- /dev/null
+++ b/service/src/main/java/com/hfkj/dao/BsOrderMapperExt.java
@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface BsOrderMapperExt {
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
new file mode 100644
index 0000000..8b516e0
--- /dev/null
+++ b/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
@@ -0,0 +1,458 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrder;
+import com.hfkj.entity.BsOrderExample.Criteria;
+import com.hfkj.entity.BsOrderExample.Criterion;
+import com.hfkj.entity.BsOrderExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class BsOrderSqlProvider {
+
+ public String countByExample(BsOrderExample example) {
+ SQL sql = new SQL();
+ sql.SELECT("count(*)").FROM("bs_order");
+ applyWhere(sql, example, false);
+ return sql.toString();
+ }
+
+ public String deleteByExample(BsOrderExample example) {
+ SQL sql = new SQL();
+ sql.DELETE_FROM("bs_order");
+ applyWhere(sql, example, false);
+ return sql.toString();
+ }
+
+ public String insertSelective(BsOrder record) {
+ SQL sql = new SQL();
+ sql.INSERT_INTO("bs_order");
+
+ if (record.getOrderNo() != null) {
+ sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
+ }
+
+ if (record.getUserId() != null) {
+ sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
+ }
+
+ if (record.getUserPhone() != null) {
+ sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}");
+ }
+
+ if (record.getImg() != null) {
+ sql.VALUES("img", "#{img,jdbcType=VARCHAR}");
+ }
+
+ if (record.getGoodsName() != null) {
+ sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
+ }
+
+ if (record.getCustomparameters() != null) {
+ sql.VALUES("customParameters", "#{customparameters,jdbcType=VARCHAR}");
+ }
+
+ if (record.getGoodsCount() != null) {
+ sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}");
+ }
+
+ if (record.getType() != null) {
+ sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
+ }
+
+ if (record.getTotalPrice() != null) {
+ sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
+ }
+
+ if (record.getPromotionamount() != null) {
+ sql.VALUES("promotionAmount", "#{promotionamount,jdbcType=DECIMAL}");
+ }
+
+ 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(BsOrderExample example) {
+ SQL sql = new SQL();
+ if (example != null && example.isDistinct()) {
+ sql.SELECT_DISTINCT("id");
+ } else {
+ sql.SELECT("id");
+ }
+ sql.SELECT("order_no");
+ sql.SELECT("user_id");
+ sql.SELECT("user_phone");
+ sql.SELECT("img");
+ sql.SELECT("goods_name");
+ sql.SELECT("customParameters");
+ sql.SELECT("goods_count");
+ sql.SELECT("`type`");
+ sql.SELECT("total_price");
+ sql.SELECT("promotionAmount");
+ 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");
+ applyWhere(sql, example, false);
+
+ if (example != null && example.getOrderByClause() != null) {
+ sql.ORDER_BY(example.getOrderByClause());
+ }
+
+ return sql.toString();
+ }
+
+ public String updateByExampleSelective(Map parameter) {
+ BsOrder record = (BsOrder) parameter.get("record");
+ BsOrderExample example = (BsOrderExample) parameter.get("example");
+
+ SQL sql = new SQL();
+ sql.UPDATE("bs_order");
+
+ if (record.getId() != null) {
+ sql.SET("id = #{record.id,jdbcType=BIGINT}");
+ }
+
+ if (record.getOrderNo() != null) {
+ sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+ }
+
+ 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.getImg() != null) {
+ sql.SET("img = #{record.img,jdbcType=VARCHAR}");
+ }
+
+ if (record.getGoodsName() != null) {
+ sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+ }
+
+ if (record.getCustomparameters() != null) {
+ sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}");
+ }
+
+ if (record.getGoodsCount() != null) {
+ sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
+ }
+
+ if (record.getType() != null) {
+ sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+ }
+
+ if (record.getTotalPrice() != null) {
+ sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+ }
+
+ if (record.getPromotionamount() != null) {
+ sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
+ }
+
+ 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 parameter) {
+ SQL sql = new SQL();
+ sql.UPDATE("bs_order");
+
+ sql.SET("id = #{record.id,jdbcType=BIGINT}");
+ sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+ sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+ sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
+ sql.SET("img = #{record.img,jdbcType=VARCHAR}");
+ sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+ sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}");
+ sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
+ sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+ sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+ sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
+ 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}");
+
+ BsOrderExample example = (BsOrderExample) parameter.get("example");
+ applyWhere(sql, example, true);
+ return sql.toString();
+ }
+
+ public String updateByPrimaryKeySelective(BsOrder record) {
+ SQL sql = new SQL();
+ sql.UPDATE("bs_order");
+
+ if (record.getOrderNo() != null) {
+ sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
+ }
+
+ if (record.getUserId() != null) {
+ sql.SET("user_id = #{userId,jdbcType=BIGINT}");
+ }
+
+ if (record.getUserPhone() != null) {
+ sql.SET("user_phone = #{userPhone,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.getCustomparameters() != null) {
+ sql.SET("customParameters = #{customparameters,jdbcType=VARCHAR}");
+ }
+
+ if (record.getGoodsCount() != null) {
+ sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}");
+ }
+
+ if (record.getType() != null) {
+ sql.SET("`type` = #{type,jdbcType=INTEGER}");
+ }
+
+ if (record.getTotalPrice() != null) {
+ sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
+ }
+
+ if (record.getPromotionamount() != null) {
+ sql.SET("promotionAmount = #{promotionamount,jdbcType=DECIMAL}");
+ }
+
+ 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, BsOrderExample 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 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 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());
+ }
+ }
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/entity/BsOrder.java b/service/src/main/java/com/hfkj/entity/BsOrder.java
new file mode 100644
index 0000000..22587ff
--- /dev/null
+++ b/service/src/main/java/com/hfkj/entity/BsOrder.java
@@ -0,0 +1,377 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * bs_order
+ * @author
+ */
+/**
+ *
+ * 代码由工具生成
+ *
+ **/
+public class BsOrder implements Serializable {
+ /**
+ * 主键
+ */
+ private Long id;
+
+ /**
+ * 交易订单号
+ */
+ private String orderNo;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 用户手机号
+ */
+ private String userPhone;
+
+ /**
+ * 图片
+ */
+ private String img;
+
+ /**
+ * 商品名称
+ */
+ private String goodsName;
+
+ /**
+ * 自定义参数
+ */
+ private String customparameters;
+
+ /**
+ * 商品数量
+ */
+ private Integer goodsCount;
+
+ /**
+ * 类型 1:淘宝 2:拼多多
+ */
+ private Integer type;
+
+ /**
+ * 交易金额
+ */
+ private BigDecimal totalPrice;
+
+ /**
+ * 佣金金额
+ */
+ private BigDecimal promotionamount;
+
+ /**
+ * 0-已支付；1-已成团；2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚
+ */
+ 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 getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ 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 String getImg() {
+ return img;
+ }
+
+ public void setImg(String img) {
+ this.img = img;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public String getCustomparameters() {
+ return customparameters;
+ }
+
+ public void setCustomparameters(String customparameters) {
+ this.customparameters = customparameters;
+ }
+
+ public Integer getGoodsCount() {
+ return goodsCount;
+ }
+
+ public void setGoodsCount(Integer goodsCount) {
+ this.goodsCount = goodsCount;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public BigDecimal getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(BigDecimal totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ public BigDecimal getPromotionamount() {
+ return promotionamount;
+ }
+
+ public void setPromotionamount(BigDecimal promotionamount) {
+ this.promotionamount = promotionamount;
+ }
+
+ 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;
+ }
+ BsOrder other = (BsOrder) that;
+ return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+ && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+ && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+ && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone()))
+ && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
+ && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
+ && (this.getCustomparameters() == null ? other.getCustomparameters() == null : this.getCustomparameters().equals(other.getCustomparameters()))
+ && (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
+ && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+ && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
+ && (this.getPromotionamount() == null ? other.getPromotionamount() == null : this.getPromotionamount().equals(other.getPromotionamount()))
+ && (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 + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+ result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+ result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
+ result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
+ result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
+ result = prime * result + ((getCustomparameters() == null) ? 0 : getCustomparameters().hashCode());
+ result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
+ result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+ result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
+ result = prime * result + ((getPromotionamount() == null) ? 0 : getPromotionamount().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(", orderNo=").append(orderNo);
+ sb.append(", userId=").append(userId);
+ sb.append(", userPhone=").append(userPhone);
+ sb.append(", img=").append(img);
+ sb.append(", goodsName=").append(goodsName);
+ sb.append(", customparameters=").append(customparameters);
+ sb.append(", goodsCount=").append(goodsCount);
+ sb.append(", type=").append(type);
+ sb.append(", totalPrice=").append(totalPrice);
+ sb.append(", promotionamount=").append(promotionamount);
+ 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();
+ }
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/entity/BsOrderExample.java b/service/src/main/java/com/hfkj/entity/BsOrderExample.java
new file mode 100644
index 0000000..868a165
--- /dev/null
+++ b/service/src/main/java/com/hfkj/entity/BsOrderExample.java
@@ -0,0 +1,1564 @@
+package com.hfkj.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BsOrderExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List oredCriteria;
+
+ private Integer limit;
+
+ private Long offset;
+
+ public BsOrderExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ public void setLimit(Integer limit) {
+ this.limit = limit;
+ }
+
+ public Integer getLimit() {
+ return limit;
+ }
+
+ public void setOffset(Long offset) {
+ this.offset = offset;
+ }
+
+ public Long getOffset() {
+ return offset;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(Long value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(Long value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(Long value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(Long value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(Long value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(Long value1, Long value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(Long value1, Long value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoIsNull() {
+ addCriterion("order_no is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoIsNotNull() {
+ addCriterion("order_no is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoEqualTo(String value) {
+ addCriterion("order_no =", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoNotEqualTo(String value) {
+ addCriterion("order_no <>", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoGreaterThan(String value) {
+ addCriterion("order_no >", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+ addCriterion("order_no >=", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoLessThan(String value) {
+ addCriterion("order_no <", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoLessThanOrEqualTo(String value) {
+ addCriterion("order_no <=", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoLike(String value) {
+ addCriterion("order_no like", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoNotLike(String value) {
+ addCriterion("order_no not like", value, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoIn(List values) {
+ addCriterion("order_no in", values, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoNotIn(List values) {
+ addCriterion("order_no not in", values, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoBetween(String value1, String value2) {
+ addCriterion("order_no between", value1, value2, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andOrderNoNotBetween(String value1, String value2) {
+ addCriterion("order_no not between", value1, value2, "orderNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdIsNull() {
+ addCriterion("user_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdIsNotNull() {
+ addCriterion("user_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdEqualTo(Long value) {
+ addCriterion("user_id =", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdNotEqualTo(Long value) {
+ addCriterion("user_id <>", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdGreaterThan(Long value) {
+ addCriterion("user_id >", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("user_id >=", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdLessThan(Long value) {
+ addCriterion("user_id <", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdLessThanOrEqualTo(Long value) {
+ addCriterion("user_id <=", value, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdIn(List values) {
+ addCriterion("user_id in", values, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdNotIn(List values) {
+ addCriterion("user_id not in", values, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdBetween(Long value1, Long value2) {
+ addCriterion("user_id between", value1, value2, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserIdNotBetween(Long value1, Long value2) {
+ addCriterion("user_id not between", value1, value2, "userId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneIsNull() {
+ addCriterion("user_phone is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneIsNotNull() {
+ addCriterion("user_phone is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneEqualTo(String value) {
+ addCriterion("user_phone =", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneNotEqualTo(String value) {
+ addCriterion("user_phone <>", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneGreaterThan(String value) {
+ addCriterion("user_phone >", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneGreaterThanOrEqualTo(String value) {
+ addCriterion("user_phone >=", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneLessThan(String value) {
+ addCriterion("user_phone <", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneLessThanOrEqualTo(String value) {
+ addCriterion("user_phone <=", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneLike(String value) {
+ addCriterion("user_phone like", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneNotLike(String value) {
+ addCriterion("user_phone not like", value, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneIn(List values) {
+ addCriterion("user_phone in", values, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneNotIn(List values) {
+ addCriterion("user_phone not in", values, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneBetween(String value1, String value2) {
+ addCriterion("user_phone between", value1, value2, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserPhoneNotBetween(String value1, String value2) {
+ addCriterion("user_phone not between", value1, value2, "userPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgIsNull() {
+ addCriterion("img is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgIsNotNull() {
+ addCriterion("img is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgEqualTo(String value) {
+ addCriterion("img =", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgNotEqualTo(String value) {
+ addCriterion("img <>", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgGreaterThan(String value) {
+ addCriterion("img >", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgGreaterThanOrEqualTo(String value) {
+ addCriterion("img >=", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgLessThan(String value) {
+ addCriterion("img <", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgLessThanOrEqualTo(String value) {
+ addCriterion("img <=", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgLike(String value) {
+ addCriterion("img like", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgNotLike(String value) {
+ addCriterion("img not like", value, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgIn(List values) {
+ addCriterion("img in", values, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgNotIn(List values) {
+ addCriterion("img not in", values, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgBetween(String value1, String value2) {
+ addCriterion("img between", value1, value2, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andImgNotBetween(String value1, String value2) {
+ addCriterion("img not between", value1, value2, "img");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameIsNull() {
+ addCriterion("goods_name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameIsNotNull() {
+ addCriterion("goods_name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameEqualTo(String value) {
+ addCriterion("goods_name =", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameNotEqualTo(String value) {
+ addCriterion("goods_name <>", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameGreaterThan(String value) {
+ addCriterion("goods_name >", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameGreaterThanOrEqualTo(String value) {
+ addCriterion("goods_name >=", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameLessThan(String value) {
+ addCriterion("goods_name <", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameLessThanOrEqualTo(String value) {
+ addCriterion("goods_name <=", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameLike(String value) {
+ addCriterion("goods_name like", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameNotLike(String value) {
+ addCriterion("goods_name not like", value, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameIn(List values) {
+ addCriterion("goods_name in", values, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameNotIn(List values) {
+ addCriterion("goods_name not in", values, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameBetween(String value1, String value2) {
+ addCriterion("goods_name between", value1, value2, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsNameNotBetween(String value1, String value2) {
+ addCriterion("goods_name not between", value1, value2, "goodsName");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersIsNull() {
+ addCriterion("customParameters is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersIsNotNull() {
+ addCriterion("customParameters is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersEqualTo(String value) {
+ addCriterion("customParameters =", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersNotEqualTo(String value) {
+ addCriterion("customParameters <>", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersGreaterThan(String value) {
+ addCriterion("customParameters >", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersGreaterThanOrEqualTo(String value) {
+ addCriterion("customParameters >=", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersLessThan(String value) {
+ addCriterion("customParameters <", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersLessThanOrEqualTo(String value) {
+ addCriterion("customParameters <=", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersLike(String value) {
+ addCriterion("customParameters like", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersNotLike(String value) {
+ addCriterion("customParameters not like", value, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersIn(List values) {
+ addCriterion("customParameters in", values, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersNotIn(List values) {
+ addCriterion("customParameters not in", values, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersBetween(String value1, String value2) {
+ addCriterion("customParameters between", value1, value2, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andCustomparametersNotBetween(String value1, String value2) {
+ addCriterion("customParameters not between", value1, value2, "customparameters");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountIsNull() {
+ addCriterion("goods_count is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountIsNotNull() {
+ addCriterion("goods_count is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountEqualTo(Integer value) {
+ addCriterion("goods_count =", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountNotEqualTo(Integer value) {
+ addCriterion("goods_count <>", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountGreaterThan(Integer value) {
+ addCriterion("goods_count >", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountGreaterThanOrEqualTo(Integer value) {
+ addCriterion("goods_count >=", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountLessThan(Integer value) {
+ addCriterion("goods_count <", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountLessThanOrEqualTo(Integer value) {
+ addCriterion("goods_count <=", value, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountIn(List values) {
+ addCriterion("goods_count in", values, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountNotIn(List values) {
+ addCriterion("goods_count not in", values, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountBetween(Integer value1, Integer value2) {
+ addCriterion("goods_count between", value1, value2, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andGoodsCountNotBetween(Integer value1, Integer value2) {
+ addCriterion("goods_count not between", value1, value2, "goodsCount");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNull() {
+ addCriterion("`type` is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNotNull() {
+ addCriterion("`type` is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeEqualTo(Integer value) {
+ addCriterion("`type` =", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotEqualTo(Integer value) {
+ addCriterion("`type` <>", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThan(Integer value) {
+ addCriterion("`type` >", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+ addCriterion("`type` >=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThan(Integer value) {
+ addCriterion("`type` <", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThanOrEqualTo(Integer value) {
+ addCriterion("`type` <=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIn(List values) {
+ addCriterion("`type` in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotIn(List values) {
+ addCriterion("`type` not in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeBetween(Integer value1, Integer value2) {
+ addCriterion("`type` between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+ addCriterion("`type` not between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceIsNull() {
+ addCriterion("total_price is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceIsNotNull() {
+ addCriterion("total_price is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceEqualTo(BigDecimal value) {
+ addCriterion("total_price =", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceNotEqualTo(BigDecimal value) {
+ addCriterion("total_price <>", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceGreaterThan(BigDecimal value) {
+ addCriterion("total_price >", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("total_price >=", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceLessThan(BigDecimal value) {
+ addCriterion("total_price <", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("total_price <=", value, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceIn(List values) {
+ addCriterion("total_price in", values, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceNotIn(List values) {
+ addCriterion("total_price not in", values, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("total_price between", value1, value2, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("total_price not between", value1, value2, "totalPrice");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountIsNull() {
+ addCriterion("promotionAmount is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountIsNotNull() {
+ addCriterion("promotionAmount is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountEqualTo(BigDecimal value) {
+ addCriterion("promotionAmount =", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountNotEqualTo(BigDecimal value) {
+ addCriterion("promotionAmount <>", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountGreaterThan(BigDecimal value) {
+ addCriterion("promotionAmount >", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("promotionAmount >=", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountLessThan(BigDecimal value) {
+ addCriterion("promotionAmount <", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("promotionAmount <=", value, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountIn(List values) {
+ addCriterion("promotionAmount in", values, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountNotIn(List values) {
+ addCriterion("promotionAmount not in", values, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("promotionAmount between", value1, value2, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andPromotionamountNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("promotionAmount not between", value1, value2, "promotionamount");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusIsNull() {
+ addCriterion("`status` is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusIsNotNull() {
+ addCriterion("`status` is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusEqualTo(Integer value) {
+ addCriterion("`status` =", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusNotEqualTo(Integer value) {
+ addCriterion("`status` <>", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusGreaterThan(Integer value) {
+ addCriterion("`status` >", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+ addCriterion("`status` >=", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusLessThan(Integer value) {
+ addCriterion("`status` <", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusLessThanOrEqualTo(Integer value) {
+ addCriterion("`status` <=", value, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusIn(List values) {
+ addCriterion("`status` in", values, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusNotIn(List values) {
+ addCriterion("`status` not in", values, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusBetween(Integer value1, Integer value2) {
+ addCriterion("`status` between", value1, value2, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+ addCriterion("`status` not between", value1, value2, "status");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNull() {
+ addCriterion("create_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNotNull() {
+ addCriterion("create_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeEqualTo(Date value) {
+ addCriterion("create_time =", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotEqualTo(Date value) {
+ addCriterion("create_time <>", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThan(Date value) {
+ addCriterion("create_time >", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("create_time >=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThan(Date value) {
+ addCriterion("create_time <", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+ addCriterion("create_time <=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIn(List values) {
+ addCriterion("create_time in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotIn(List values) {
+ addCriterion("create_time not in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeBetween(Date value1, Date value2) {
+ addCriterion("create_time between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+ addCriterion("create_time not between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeIsNull() {
+ addCriterion("pay_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeIsNotNull() {
+ addCriterion("pay_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeEqualTo(Date value) {
+ addCriterion("pay_time =", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeNotEqualTo(Date value) {
+ addCriterion("pay_time <>", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeGreaterThan(Date value) {
+ addCriterion("pay_time >", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("pay_time >=", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeLessThan(Date value) {
+ addCriterion("pay_time <", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeLessThanOrEqualTo(Date value) {
+ addCriterion("pay_time <=", value, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeIn(List values) {
+ addCriterion("pay_time in", values, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeNotIn(List values) {
+ addCriterion("pay_time not in", values, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeBetween(Date value1, Date value2) {
+ addCriterion("pay_time between", value1, value2, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andPayTimeNotBetween(Date value1, Date value2) {
+ addCriterion("pay_time not between", value1, value2, "payTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeIsNull() {
+ addCriterion("cancel_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeIsNotNull() {
+ addCriterion("cancel_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeEqualTo(Date value) {
+ addCriterion("cancel_time =", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeNotEqualTo(Date value) {
+ addCriterion("cancel_time <>", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeGreaterThan(Date value) {
+ addCriterion("cancel_time >", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("cancel_time >=", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeLessThan(Date value) {
+ addCriterion("cancel_time <", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeLessThanOrEqualTo(Date value) {
+ addCriterion("cancel_time <=", value, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeIn(List values) {
+ addCriterion("cancel_time in", values, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeNotIn(List values) {
+ addCriterion("cancel_time not in", values, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeBetween(Date value1, Date value2) {
+ addCriterion("cancel_time between", value1, value2, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCancelTimeNotBetween(Date value1, Date value2) {
+ addCriterion("cancel_time not between", value1, value2, "cancelTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeIsNull() {
+ addCriterion("refund_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeIsNotNull() {
+ addCriterion("refund_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeEqualTo(Date value) {
+ addCriterion("refund_time =", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeNotEqualTo(Date value) {
+ addCriterion("refund_time <>", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeGreaterThan(Date value) {
+ addCriterion("refund_time >", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("refund_time >=", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeLessThan(Date value) {
+ addCriterion("refund_time <", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeLessThanOrEqualTo(Date value) {
+ addCriterion("refund_time <=", value, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeIn(List values) {
+ addCriterion("refund_time in", values, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeNotIn(List values) {
+ addCriterion("refund_time not in", values, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeBetween(Date value1, Date value2) {
+ addCriterion("refund_time between", value1, value2, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRefundTimeNotBetween(Date value1, Date value2) {
+ addCriterion("refund_time not between", value1, value2, "refundTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeIsNull() {
+ addCriterion("finish_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeIsNotNull() {
+ addCriterion("finish_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeEqualTo(Date value) {
+ addCriterion("finish_time =", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeNotEqualTo(Date value) {
+ addCriterion("finish_time <>", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeGreaterThan(Date value) {
+ addCriterion("finish_time >", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("finish_time >=", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeLessThan(Date value) {
+ addCriterion("finish_time <", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeLessThanOrEqualTo(Date value) {
+ addCriterion("finish_time <=", value, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeIn(List values) {
+ addCriterion("finish_time in", values, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeNotIn(List values) {
+ addCriterion("finish_time not in", values, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeBetween(Date value1, Date value2) {
+ addCriterion("finish_time between", value1, value2, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFinishTimeNotBetween(Date value1, Date value2) {
+ addCriterion("finish_time not between", value1, value2, "finishTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNull() {
+ addCriterion("update_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNotNull() {
+ addCriterion("update_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeEqualTo(Date value) {
+ addCriterion("update_time =", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotEqualTo(Date value) {
+ addCriterion("update_time <>", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThan(Date value) {
+ addCriterion("update_time >", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("update_time >=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThan(Date value) {
+ addCriterion("update_time <", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+ addCriterion("update_time <=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIn(List values) {
+ addCriterion("update_time in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotIn(List values) {
+ addCriterion("update_time not in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+ addCriterion("update_time between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+ addCriterion("update_time not between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1IsNull() {
+ addCriterion("ext_1 is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1IsNotNull() {
+ addCriterion("ext_1 is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1EqualTo(String value) {
+ addCriterion("ext_1 =", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1NotEqualTo(String value) {
+ addCriterion("ext_1 <>", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1GreaterThan(String value) {
+ addCriterion("ext_1 >", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1GreaterThanOrEqualTo(String value) {
+ addCriterion("ext_1 >=", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1LessThan(String value) {
+ addCriterion("ext_1 <", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1LessThanOrEqualTo(String value) {
+ addCriterion("ext_1 <=", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1Like(String value) {
+ addCriterion("ext_1 like", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1NotLike(String value) {
+ addCriterion("ext_1 not like", value, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1In(List values) {
+ addCriterion("ext_1 in", values, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1NotIn(List values) {
+ addCriterion("ext_1 not in", values, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1Between(String value1, String value2) {
+ addCriterion("ext_1 between", value1, value2, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt1NotBetween(String value1, String value2) {
+ addCriterion("ext_1 not between", value1, value2, "ext1");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2IsNull() {
+ addCriterion("ext_2 is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2IsNotNull() {
+ addCriterion("ext_2 is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2EqualTo(String value) {
+ addCriterion("ext_2 =", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2NotEqualTo(String value) {
+ addCriterion("ext_2 <>", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2GreaterThan(String value) {
+ addCriterion("ext_2 >", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2GreaterThanOrEqualTo(String value) {
+ addCriterion("ext_2 >=", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2LessThan(String value) {
+ addCriterion("ext_2 <", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2LessThanOrEqualTo(String value) {
+ addCriterion("ext_2 <=", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2Like(String value) {
+ addCriterion("ext_2 like", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2NotLike(String value) {
+ addCriterion("ext_2 not like", value, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2In(List values) {
+ addCriterion("ext_2 in", values, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2NotIn(List values) {
+ addCriterion("ext_2 not in", values, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2Between(String value1, String value2) {
+ addCriterion("ext_2 between", value1, value2, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt2NotBetween(String value1, String value2) {
+ addCriterion("ext_2 not between", value1, value2, "ext2");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3IsNull() {
+ addCriterion("ext_3 is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3IsNotNull() {
+ addCriterion("ext_3 is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3EqualTo(String value) {
+ addCriterion("ext_3 =", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3NotEqualTo(String value) {
+ addCriterion("ext_3 <>", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3GreaterThan(String value) {
+ addCriterion("ext_3 >", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3GreaterThanOrEqualTo(String value) {
+ addCriterion("ext_3 >=", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3LessThan(String value) {
+ addCriterion("ext_3 <", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3LessThanOrEqualTo(String value) {
+ addCriterion("ext_3 <=", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3Like(String value) {
+ addCriterion("ext_3 like", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3NotLike(String value) {
+ addCriterion("ext_3 not like", value, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3In(List values) {
+ addCriterion("ext_3 in", values, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3NotIn(List values) {
+ addCriterion("ext_3 not in", values, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3Between(String value1, String value2) {
+ addCriterion("ext_3 between", value1, value2, "ext3");
+ return (Criteria) this;
+ }
+
+ public Criteria andExt3NotBetween(String value1, String value2) {
+ addCriterion("ext_3 not between", value1, value2, "ext3");
+ return (Criteria) this;
+ }
+ }
+
+ /**
+ */
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/hfkj/model/GoodsInfoModel.java b/service/src/main/java/com/hfkj/model/GoodsInfoModel.java
index 74065f9..e654e97 100644
--- a/service/src/main/java/com/hfkj/model/GoodsInfoModel.java
+++ b/service/src/main/java/com/hfkj/model/GoodsInfoModel.java
@@ -36,4 +36,9 @@ public class GoodsInfoModel {
* 元宝数量
*/
BigDecimal ingot;
+
+ /**
+ * 库存
+ */
+ String annualVol;
}
diff --git a/service/src/main/java/com/hfkj/model/GoodsModel.java b/service/src/main/java/com/hfkj/model/GoodsModel.java
index 177e4be..e941d72 100644
--- a/service/src/main/java/com/hfkj/model/GoodsModel.java
+++ b/service/src/main/java/com/hfkj/model/GoodsModel.java
@@ -1,5 +1,6 @@
package com.hfkj.model;
+import com.alibaba.fastjson.JSONObject;
import lombok.Data;
@@ -18,4 +19,9 @@ public class GoodsModel {
*/
GoodsInfoModel goodsInfo;
+ /**
+ * 拼多多授权地址
+ */
+ JSONObject pddUrl;
+
}
diff --git a/service/src/main/java/com/hfkj/model/PricePromotionInfoModel.java b/service/src/main/java/com/hfkj/model/PricePromotionInfoModel.java
index 28537a4..5de08b0 100644
--- a/service/src/main/java/com/hfkj/model/PricePromotionInfoModel.java
+++ b/service/src/main/java/com/hfkj/model/PricePromotionInfoModel.java
@@ -18,6 +18,10 @@ public class PricePromotionInfoModel {
* 预估到手价(元)。若属于预售商品，付定金时间内，预估到手价价=定金+尾款的预估到手价
*/
BigDecimal finalPromotionPrice;
+ /**
+ * 优惠券金额
+ */
+ BigDecimal couponPrice;
/**
* 销售价格，无促销时等于一口价，有促销时为促销价。若属于预售商品，付定金时间内，在线售卖价=预售价
*/
diff --git a/service/src/main/java/com/hfkj/service/goods/GoodsDataService.java b/service/src/main/java/com/hfkj/service/goods/GoodsDataService.java
index 0ff8305..328e18e 100644
--- a/service/src/main/java/com/hfkj/service/goods/GoodsDataService.java
+++ b/service/src/main/java/com/hfkj/service/goods/GoodsDataService.java
@@ -23,5 +23,13 @@ public interface GoodsDataService {
*/
List goodsModelTaoBaoList(JSONObject jsonObject);
+ /**
+ * @MethodName goodsModelPddList
+ * @Description: 拼多多数据整理
+ * @param jsonObject
+ * @return: java.util.List
+ * @Author: Sum1Dream
+ * @Date: 2024/9/20 下午2:21
+ */
List goodsModelPddList(JSONObject jsonObject);
}
diff --git a/service/src/main/java/com/hfkj/service/goods/impl/GoodsDataServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/GoodsDataServiceImpl.java
index 0f3b0bf..d240fba 100644
--- a/service/src/main/java/com/hfkj/service/goods/impl/GoodsDataServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/goods/impl/GoodsDataServiceImpl.java
@@ -10,9 +10,12 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
@Service("goodsDataService")
public class GoodsDataServiceImpl implements GoodsDataService {
@@ -38,7 +41,7 @@ public class GoodsDataServiceImpl implements GoodsDataService {
MorePromotionModel morePromotionModel;
List morePromotionModels;
// 获取元宝的汇率
- SecDictionary dictionary = secDictionaryService.findDictionary("GRADE_EXCHANGE_RATE");
+ SecDictionary dictionary = secDictionaryService.findDictionary("GOLD_COIN_EXCHANGE_RATE");
JSONArray data = jsonObject.getJSONArray("result_list");
@@ -49,7 +52,6 @@ public class GoodsDataServiceImpl implements GoodsDataService {
JSONObject price_promotion_info = object.getJSONObject("price_promotion_info");
JSONObject item_basic_info = object.getJSONObject("item_basic_info");
JSONObject income_info = publish_info.getJSONObject("income_info");
- JSONArray more_promotion_list = price_promotion_info.getJSONArray("more_promotion_list");
JSONArray final_promotion_path_list = price_promotion_info.getJSONArray("final_promotion_path_list");
// 淘客推广信息
@@ -66,15 +68,25 @@ public class GoodsDataServiceImpl implements GoodsDataService {
publishInfoModel.setIncomeInfo(incomeInfoModel);
// 插入淘客推广信息
goodsModel.setPublishInfo(publishInfoModel);
+ String small_images;
// 商品基础信息
goodsInfoModel = new GoodsInfoModel();
goodsInfoModel.setIngot(incomeInfoModel.getCommissionAmount().multiply(new BigDecimal(dictionary.getCodeValue())));
goodsInfoModel.setProvCity(item_basic_info.getString("prov_city"));
goodsInfoModel.setTitle(item_basic_info.getString("title"));
+ goodsInfoModel.setAnnualVol(item_basic_info.getString("annual_vol"));
goodsInfoModel.setPictUrl(item_basic_info.getString("pict_url"));
goodsInfoModel.setShortTitle(item_basic_info.getString("short_title"));
- String small_images = item_basic_info.getJSONArray("small_images").toString();
- goodsInfoModel.setSmallImages(JSONObject.parseArray(small_images,String.class));
+ if (item_basic_info.getJSONArray("small_images") == null) {
+ List arrayList = new ArrayList<>();
+ arrayList.add(item_basic_info.getString("pict_url"));
+ goodsInfoModel.setSmallImages(arrayList);
+ } else {
+ small_images = item_basic_info.getJSONArray("small_images").toString();
+ goodsInfoModel.setSmallImages(JSONObject.parseArray(small_images,String.class));
+ }
+
+
goodsInfoModel.setShopTitle(item_basic_info.getString("shop_title"));
// 插入商品基础信息
goodsModel.setGoodsInfo(goodsInfoModel);
@@ -83,20 +95,10 @@ public class GoodsDataServiceImpl implements GoodsDataService {
pricePromotionInfoModel.setReservePrice(price_promotion_info.getBigDecimal("reserve_price"));
pricePromotionInfoModel.setZkFinalPrice(price_promotion_info.getBigDecimal("zk_final_price"));
pricePromotionInfoModel.setFinalPromotionPrice(price_promotion_info.getBigDecimal("final_promotion_price"));
+ pricePromotionInfoModel.setCouponPrice(pricePromotionInfoModel.getZkFinalPrice().subtract(pricePromotionInfoModel.getFinalPromotionPrice()));
// 更多活动优惠
morePromotionModels = new ArrayList<>();
- if (more_promotion_list != null && !more_promotion_list.isEmpty()) {
- for (Object more_promotion : more_promotion_list) {
- JSONObject morePromotion = (JSONObject) more_promotion;
- morePromotionModel = new MorePromotionModel();
- morePromotionModel.setPromotionDesc(morePromotion.getString("promotion_desc"));
- morePromotionModel.setPromotionTitle(morePromotion.getString("promotion_title"));
- morePromotionModel.setPromotionStartTime(morePromotion.getString("promotion_start_time"));
- morePromotionModel.setPromotionEndTime(morePromotion.getString("promotion_end_time"));
- morePromotionModel.setPromotionId(morePromotion.getString("promotion_id"));
- morePromotionModels.add(morePromotionModel);
- }
- }
+
if (final_promotion_path_list != null && !final_promotion_path_list.isEmpty()) {
for (Object final_promotion : final_promotion_path_list) {
JSONObject morePromotion = (JSONObject) final_promotion;
@@ -111,10 +113,15 @@ public class GoodsDataServiceImpl implements GoodsDataService {
}
}
+
+ morePromotionModels = morePromotionModels.stream().sorted(Comparator.comparing(MorePromotionModel:: getPromotionFee).reversed()).collect(Collectors.toList());
// 插入更多活动优惠
pricePromotionInfoModel.setMorePromotionList(morePromotionModels);
goodsModel.setPricePromotionInfo(pricePromotionInfoModel);
- goodsModelList.add(goodsModel);
+ if (!morePromotionModels.isEmpty()) {
+ goodsModelList.add(goodsModel);
+ }
+
}
return goodsModelList;
@@ -131,25 +138,60 @@ public class GoodsDataServiceImpl implements GoodsDataService {
PricePromotionInfoModel pricePromotionInfoModel;
// 基础信息
GoodsInfoModel goodsInfoModel;
- // 商品佣金信息
- IncomeInfoModel incomeInfoModel;
+
// 更多活动优惠
MorePromotionModel morePromotionModel;
List morePromotionModels;
+ // 获取元宝的汇率
+ SecDictionary dictionary = secDictionaryService.findDictionary("GOLD_COIN_EXCHANGE_RATE");
- JSONArray array = jsonObject.getJSONObject("goodsSearchResponse").getJSONArray("goodsSearchResponse");
+ JSONArray array = jsonObject.getJSONObject("goodsSearchResponse").getJSONArray("goodsList");
for (Object object : array) {
JSONObject goods = (JSONObject) object;
goodsModel = new GoodsModel();
+
+ // 商品基础信息
+ goodsInfoModel = new GoodsInfoModel();
+ goodsInfoModel.setTitle(goods.getString("goodsName"));
+ goodsInfoModel.setAnnualVol(goods.getString("salesTip"));
+ goodsInfoModel.setPictUrl(goods.getString("goodsImageUrl"));
+ goodsInfoModel.setShopTitle(goods.getString("mallName"));
+ goodsInfoModel.setIngot(
+ goods.getBigDecimal("minNormalPrice").
+ multiply(goods.getBigDecimal("promotionRate").
+ multiply(new BigDecimal(dictionary.getCodeValue()))).
+ divide(new BigDecimal(100*1000) , 6 , RoundingMode.DOWN)
+ );
+ // 插入商品基础信息
+ goodsModel.setGoodsInfo(goodsInfoModel);
// 淘客推广信息
- // 商品佣金信息
- incomeInfoModel = new IncomeInfoModel();
publishInfoModel = new PublishInfoModel();
+ publishInfoModel.setGoodsSign(goods.getString("goodsSign"));
+ publishInfoModel.setSearchId(goods.getString("searchId"));
+ // 插入淘客推广信息
+ goodsModel.setPublishInfo(publishInfoModel);
+ // 更多活动优惠
+ morePromotionModels = new ArrayList<>();
+ morePromotionModel = new MorePromotionModel();
+ morePromotionModel.setPromotionFee(goods.getBigDecimal("couponDiscount").divide(new BigDecimal(100) , 2 , RoundingMode.DOWN));
+ morePromotionModel.setPromotionStartTime(goods.getString("couponStartTime"));
+ morePromotionModel.setPromotionEndTime(goods.getString("couponEndTime"));
+ morePromotionModels.add(morePromotionModel);
+
+ // 价格促销信息
+ pricePromotionInfoModel = new PricePromotionInfoModel();
+ pricePromotionInfoModel.setReservePrice(goods.getBigDecimal("minNormalPrice").divide(new BigDecimal(100) , 2 , RoundingMode.DOWN));
+ pricePromotionInfoModel.setZkFinalPrice(goods.getBigDecimal("minGroupPrice").divide(new BigDecimal(100) , 2 , RoundingMode.DOWN));
+ pricePromotionInfoModel.setFinalPromotionPrice(pricePromotionInfoModel.getZkFinalPrice());
+ // 插入更多活动优惠
+ pricePromotionInfoModel.setMorePromotionList(morePromotionModels);
+ goodsModel.setPricePromotionInfo(pricePromotionInfoModel);
+ goodsModelList.add(goodsModel);
}
- return Collections.emptyList();
+ return goodsModelList;
}
}
diff --git a/service/src/main/java/com/hfkj/service/pdd/PddService.java b/service/src/main/java/com/hfkj/service/pdd/PddService.java
index 4a67a5a..0f76da5 100644
--- a/service/src/main/java/com/hfkj/service/pdd/PddService.java
+++ b/service/src/main/java/com/hfkj/service/pdd/PddService.java
@@ -8,10 +8,12 @@ import com.pdd.pop.sdk.http.PopHttpClient;
import com.pdd.pop.sdk.http.api.pop.request.PddDdkGoodsPromotionUrlGenerateRequest;
import com.pdd.pop.sdk.http.api.pop.request.PddDdkGoodsSearchRequest;
import com.pdd.pop.sdk.http.api.pop.request.PddDdkMemberAuthorityQueryRequest;
+import com.pdd.pop.sdk.http.api.pop.request.PddDdkRpPromUrlGenerateRequest;
import com.pdd.pop.sdk.http.api.pop.response.PddDdkGoodsPromotionUrlGenerateResponse;
import com.pdd.pop.sdk.http.api.pop.response.PddDdkGoodsSearchResponse;
import com.pdd.pop.sdk.http.api.pop.response.PddDdkMemberAuthorityQueryResponse;
+import com.pdd.pop.sdk.http.api.pop.response.PddDdkRpPromUrlGenerateResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,6 +83,36 @@ public class PddService {
}
+ /**
+ * @MethodName promotion
+ * @Description: 生成授权地址
+ * @param
+ * @return: com.alibaba.fastjson.JSONObject
+ * @Author: Sum1Dream
+ * @Date: 2024/9/20 下午3:57
+ */
+ public static JSONObject promotion() throws Exception {
+
+ log.info("============ 拼多多请求-START =============");
+ String clientId = "71a050c5d93d4169a237539af44c7c33";
+ String clientSecret = "b96def667dd28660d09f19ba2e9e9f23d810d563";
+ PopClient client = new PopHttpClient(clientId, clientSecret);
+
+ PddDdkRpPromUrlGenerateRequest request = new PddDdkRpPromUrlGenerateRequest();
+ List pIdList = new ArrayList<>();
+ pIdList.add("41483885_294044603");
+ request.setPIdList(pIdList);
+ request.setChannelType(10);
+ PddDdkRpPromUrlGenerateResponse response = client.syncInvoke(request);
+
+ log.info("请求接口：" + "promotion");
+ log.info("请求参数：" + JSONObject.toJSONString(request));
+ log.info("响应参数：" + JsonUtil.transferToJson(response));
+ log.info("============ 拼多多请求-END ==============");
+ return JSONObject.parseObject(JSON.toJSONString(response));
+
+ }
+
/**
* @MethodName authority
* @Description: 查询是否绑定备案