define api and db mapper
Showing
15 changed files
with
648 additions
and
71 deletions
1 | +package com.yohoufo.dal.order; | ||
2 | + | ||
3 | +import com.yohoufo.dal.order.model.AppraiseOrderMeta; | ||
4 | + | ||
5 | +public interface AppraiseOrderMetaMapper { | ||
6 | + int deleteByPrimaryKey(Integer id); | ||
7 | + | ||
8 | + int insert(AppraiseOrderMeta record); | ||
9 | + | ||
10 | + int insertSelective(AppraiseOrderMeta record); | ||
11 | + | ||
12 | + AppraiseOrderMeta selectByPrimaryKey(Integer id); | ||
13 | + | ||
14 | + int updateByPrimaryKeySelective(AppraiseOrderMeta record); | ||
15 | + | ||
16 | + int updateByPrimaryKey(AppraiseOrderMeta record); | ||
17 | +} |
1 | +package com.yohoufo.dal.order; | ||
2 | + | ||
3 | +import com.yohoufo.dal.order.model.AppraiseOrderStorage; | ||
4 | + | ||
5 | +public interface AppraiseOrderStorageMapper { | ||
6 | + int deleteByPrimaryKey(Integer id); | ||
7 | + | ||
8 | + int insert(AppraiseOrderStorage record); | ||
9 | + | ||
10 | + int insertSelective(AppraiseOrderStorage record); | ||
11 | + | ||
12 | + AppraiseOrderStorage selectByPrimaryKey(Integer id); | ||
13 | + | ||
14 | + int updateByPrimaryKeySelective(AppraiseOrderStorage record); | ||
15 | + | ||
16 | + int updateByPrimaryKey(AppraiseOrderStorage record); | ||
17 | +} |
@@ -10,11 +10,13 @@ public class AppraiseOrder { | @@ -10,11 +10,13 @@ public class AppraiseOrder { | ||
10 | 10 | ||
11 | private Integer uid; | 11 | private Integer uid; |
12 | 12 | ||
13 | + private Long parentOrderCode; | ||
14 | + | ||
13 | private Long orderCode; | 15 | private Long orderCode; |
14 | 16 | ||
15 | - private Byte clientType; | 17 | + private Integer clientType; |
16 | 18 | ||
17 | - private Byte payment; | 19 | + private Integer payment; |
18 | 20 | ||
19 | private BigDecimal amount; | 21 | private BigDecimal amount; |
20 | 22 | ||
@@ -26,7 +28,11 @@ public class AppraiseOrder { | @@ -26,7 +28,11 @@ public class AppraiseOrder { | ||
26 | 28 | ||
27 | private Integer updateTime; | 29 | private Integer updateTime; |
28 | 30 | ||
29 | - private Byte isDel; | 31 | + private Integer isDel; |
30 | 32 | ||
31 | private String channelNo; | 33 | private String channelNo; |
34 | + | ||
35 | + private Integer attributes; | ||
36 | + | ||
37 | + private Byte platformDeliveryStatus; | ||
32 | } | 38 | } |
1 | package com.yohoufo.dal.order.model; | 1 | package com.yohoufo.dal.order.model; |
2 | 2 | ||
3 | +import lombok.Data; | ||
4 | + | ||
5 | +@Data | ||
3 | public class AppraiseOrderGoods { | 6 | public class AppraiseOrderGoods { |
4 | private Integer id; | 7 | private Integer id; |
5 | 8 | ||
@@ -13,51 +16,8 @@ public class AppraiseOrderGoods { | @@ -13,51 +16,8 @@ public class AppraiseOrderGoods { | ||
13 | 16 | ||
14 | private String imageUrl; | 17 | private String imageUrl; |
15 | 18 | ||
16 | - public Integer getId() { | ||
17 | - return id; | ||
18 | - } | ||
19 | - | ||
20 | - public void setId(Integer id) { | ||
21 | - this.id = id; | ||
22 | - } | ||
23 | - | ||
24 | - public Long getOrderCode() { | ||
25 | - return orderCode; | ||
26 | - } | ||
27 | - | ||
28 | - public void setOrderCode(Long orderCode) { | ||
29 | - this.orderCode = orderCode; | ||
30 | - } | ||
31 | - | ||
32 | - public Integer getProductId() { | ||
33 | - return productId; | ||
34 | - } | ||
35 | - | ||
36 | - public void setProductId(Integer productId) { | ||
37 | - this.productId = productId; | ||
38 | - } | ||
39 | - | ||
40 | - public String getProductName() { | ||
41 | - return productName; | ||
42 | - } | ||
43 | - | ||
44 | - public void setProductName(String productName) { | ||
45 | - this.productName = productName == null ? null : productName.trim(); | ||
46 | - } | ||
47 | - | ||
48 | - public String getProductCode() { | ||
49 | - return productCode; | ||
50 | - } | ||
51 | - | ||
52 | - public void setProductCode(String productCode) { | ||
53 | - this.productCode = productCode == null ? null : productCode.trim(); | ||
54 | - } | 19 | + private Integer depotNo; |
55 | 20 | ||
56 | - public String getImageUrl() { | ||
57 | - return imageUrl; | ||
58 | - } | 21 | + private Integer num; |
59 | 22 | ||
60 | - public void setImageUrl(String imageUrl) { | ||
61 | - this.imageUrl = imageUrl == null ? null : imageUrl.trim(); | ||
62 | - } | ||
63 | } | 23 | } |
1 | +package com.yohoufo.dal.order.model; | ||
2 | + | ||
3 | +public class AppraiseOrderMeta { | ||
4 | + private Integer id; | ||
5 | + | ||
6 | + private Integer uid; | ||
7 | + | ||
8 | + private Long orderCode; | ||
9 | + | ||
10 | + private Integer storageId; | ||
11 | + | ||
12 | + private String metaKey; | ||
13 | + | ||
14 | + private String metaValue; | ||
15 | + | ||
16 | + public Integer getId() { | ||
17 | + return id; | ||
18 | + } | ||
19 | + | ||
20 | + public void setId(Integer id) { | ||
21 | + this.id = id; | ||
22 | + } | ||
23 | + | ||
24 | + public Integer getUid() { | ||
25 | + return uid; | ||
26 | + } | ||
27 | + | ||
28 | + public void setUid(Integer uid) { | ||
29 | + this.uid = uid; | ||
30 | + } | ||
31 | + | ||
32 | + public Long getOrderCode() { | ||
33 | + return orderCode; | ||
34 | + } | ||
35 | + | ||
36 | + public void setOrderCode(Long orderCode) { | ||
37 | + this.orderCode = orderCode; | ||
38 | + } | ||
39 | + | ||
40 | + public Integer getStorageId() { | ||
41 | + return storageId; | ||
42 | + } | ||
43 | + | ||
44 | + public void setStorageId(Integer storageId) { | ||
45 | + this.storageId = storageId; | ||
46 | + } | ||
47 | + | ||
48 | + public String getMetaKey() { | ||
49 | + return metaKey; | ||
50 | + } | ||
51 | + | ||
52 | + public void setMetaKey(String metaKey) { | ||
53 | + this.metaKey = metaKey == null ? null : metaKey.trim(); | ||
54 | + } | ||
55 | + | ||
56 | + public String getMetaValue() { | ||
57 | + return metaValue; | ||
58 | + } | ||
59 | + | ||
60 | + public void setMetaValue(String metaValue) { | ||
61 | + this.metaValue = metaValue == null ? null : metaValue.trim(); | ||
62 | + } | ||
63 | +} |
1 | +package com.yohoufo.dal.order.model; | ||
2 | + | ||
3 | +public class AppraiseOrderStorage { | ||
4 | + private Integer id; | ||
5 | + | ||
6 | + private Long orderCode; | ||
7 | + | ||
8 | + private Integer productId; | ||
9 | + | ||
10 | + private Integer sizeId; | ||
11 | + | ||
12 | + private String sizeName; | ||
13 | + | ||
14 | + private Integer colorId; | ||
15 | + | ||
16 | + private String colorName; | ||
17 | + | ||
18 | + private Integer storageId; | ||
19 | + | ||
20 | + private Integer num; | ||
21 | + | ||
22 | + public Integer getId() { | ||
23 | + return id; | ||
24 | + } | ||
25 | + | ||
26 | + public void setId(Integer id) { | ||
27 | + this.id = id; | ||
28 | + } | ||
29 | + | ||
30 | + public Long getOrderCode() { | ||
31 | + return orderCode; | ||
32 | + } | ||
33 | + | ||
34 | + public void setOrderCode(Long orderCode) { | ||
35 | + this.orderCode = orderCode; | ||
36 | + } | ||
37 | + | ||
38 | + public Integer getProductId() { | ||
39 | + return productId; | ||
40 | + } | ||
41 | + | ||
42 | + public void setProductId(Integer productId) { | ||
43 | + this.productId = productId; | ||
44 | + } | ||
45 | + | ||
46 | + public Integer getSizeId() { | ||
47 | + return sizeId; | ||
48 | + } | ||
49 | + | ||
50 | + public void setSizeId(Integer sizeId) { | ||
51 | + this.sizeId = sizeId; | ||
52 | + } | ||
53 | + | ||
54 | + public String getSizeName() { | ||
55 | + return sizeName; | ||
56 | + } | ||
57 | + | ||
58 | + public void setSizeName(String sizeName) { | ||
59 | + this.sizeName = sizeName == null ? null : sizeName.trim(); | ||
60 | + } | ||
61 | + | ||
62 | + public Integer getColorId() { | ||
63 | + return colorId; | ||
64 | + } | ||
65 | + | ||
66 | + public void setColorId(Integer colorId) { | ||
67 | + this.colorId = colorId; | ||
68 | + } | ||
69 | + | ||
70 | + public String getColorName() { | ||
71 | + return colorName; | ||
72 | + } | ||
73 | + | ||
74 | + public void setColorName(String colorName) { | ||
75 | + this.colorName = colorName == null ? null : colorName.trim(); | ||
76 | + } | ||
77 | + | ||
78 | + public Integer getStorageId() { | ||
79 | + return storageId; | ||
80 | + } | ||
81 | + | ||
82 | + public void setStorageId(Integer storageId) { | ||
83 | + this.storageId = storageId; | ||
84 | + } | ||
85 | + | ||
86 | + public Integer getNum() { | ||
87 | + return num; | ||
88 | + } | ||
89 | + | ||
90 | + public void setNum(Integer num) { | ||
91 | + this.num = num; | ||
92 | + } | ||
93 | +} |
@@ -8,9 +8,11 @@ | @@ -8,9 +8,11 @@ | ||
8 | <result column="product_name" jdbcType="VARCHAR" property="productName" /> | 8 | <result column="product_name" jdbcType="VARCHAR" property="productName" /> |
9 | <result column="product_code" jdbcType="VARCHAR" property="productCode" /> | 9 | <result column="product_code" jdbcType="VARCHAR" property="productCode" /> |
10 | <result column="image_url" jdbcType="VARCHAR" property="imageUrl" /> | 10 | <result column="image_url" jdbcType="VARCHAR" property="imageUrl" /> |
11 | + <result column="depot_no" jdbcType="INTEGER" property="depotNo" /> | ||
12 | + <result column="num" jdbcType="INTEGER" property="num" /> | ||
11 | </resultMap> | 13 | </resultMap> |
12 | <sql id="Base_Column_List"> | 14 | <sql id="Base_Column_List"> |
13 | - id, order_code, product_id, product_name, product_code, image_url | 15 | + id, order_code, product_id, product_name, product_code, image_url, depot_no, num |
14 | </sql> | 16 | </sql> |
15 | <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | 17 | <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> |
16 | select | 18 | select |
@@ -21,9 +23,11 @@ | @@ -21,9 +23,11 @@ | ||
21 | 23 | ||
22 | <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods" useGeneratedKeys="true"> | 24 | <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods" useGeneratedKeys="true"> |
23 | insert into appraise_order_goods (order_code, product_id, product_name, | 25 | insert into appraise_order_goods (order_code, product_id, product_name, |
24 | - product_code, image_url) | 26 | + product_code, image_url, depot_no, |
27 | + num) | ||
25 | values (#{orderCode,jdbcType=BIGINT}, #{productId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, | 28 | values (#{orderCode,jdbcType=BIGINT}, #{productId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, |
26 | - #{productCode,jdbcType=VARCHAR}, #{imageUrl,jdbcType=VARCHAR}) | 29 | + #{productCode,jdbcType=VARCHAR}, #{imageUrl,jdbcType=VARCHAR}, #{depotNo,jdbcType=INTEGER}, |
30 | + #{num,jdbcType=INTEGER}) | ||
27 | </insert> | 31 | </insert> |
28 | 32 | ||
29 | <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods" useGeneratedKeys="true"> | 33 | <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods" useGeneratedKeys="true"> |
@@ -44,6 +48,12 @@ | @@ -44,6 +48,12 @@ | ||
44 | <if test="imageUrl != null"> | 48 | <if test="imageUrl != null"> |
45 | image_url, | 49 | image_url, |
46 | </if> | 50 | </if> |
51 | + <if test="depotNo != null"> | ||
52 | + depot_no, | ||
53 | + </if> | ||
54 | + <if test="num != null"> | ||
55 | + num, | ||
56 | + </if> | ||
47 | </trim> | 57 | </trim> |
48 | <trim prefix="values (" suffix=")" suffixOverrides=","> | 58 | <trim prefix="values (" suffix=")" suffixOverrides=","> |
49 | <if test="orderCode != null"> | 59 | <if test="orderCode != null"> |
@@ -61,6 +71,12 @@ | @@ -61,6 +71,12 @@ | ||
61 | <if test="imageUrl != null"> | 71 | <if test="imageUrl != null"> |
62 | #{imageUrl,jdbcType=VARCHAR}, | 72 | #{imageUrl,jdbcType=VARCHAR}, |
63 | </if> | 73 | </if> |
74 | + <if test="depotNo != null"> | ||
75 | + #{depotNo,jdbcType=INTEGER}, | ||
76 | + </if> | ||
77 | + <if test="num != null"> | ||
78 | + #{num,jdbcType=INTEGER}, | ||
79 | + </if> | ||
64 | </trim> | 80 | </trim> |
65 | </insert> | 81 | </insert> |
66 | <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods"> | 82 | <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrderGoods"> |
@@ -81,6 +97,12 @@ | @@ -81,6 +97,12 @@ | ||
81 | <if test="imageUrl != null"> | 97 | <if test="imageUrl != null"> |
82 | image_url = #{imageUrl,jdbcType=VARCHAR}, | 98 | image_url = #{imageUrl,jdbcType=VARCHAR}, |
83 | </if> | 99 | </if> |
100 | + <if test="depotNo != null"> | ||
101 | + depot_no = #{depotNo,jdbcType=INTEGER}, | ||
102 | + </if> | ||
103 | + <if test="num != null"> | ||
104 | + num = #{num,jdbcType=INTEGER}, | ||
105 | + </if> | ||
84 | </set> | 106 | </set> |
85 | where id = #{id,jdbcType=INTEGER} | 107 | where id = #{id,jdbcType=INTEGER} |
86 | </update> | 108 | </update> |
@@ -90,7 +112,9 @@ | @@ -90,7 +112,9 @@ | ||
90 | product_id = #{productId,jdbcType=INTEGER}, | 112 | product_id = #{productId,jdbcType=INTEGER}, |
91 | product_name = #{productName,jdbcType=VARCHAR}, | 113 | product_name = #{productName,jdbcType=VARCHAR}, |
92 | product_code = #{productCode,jdbcType=VARCHAR}, | 114 | product_code = #{productCode,jdbcType=VARCHAR}, |
93 | - image_url = #{imageUrl,jdbcType=VARCHAR} | 115 | + image_url = #{imageUrl,jdbcType=VARCHAR}, |
116 | + depot_no = #{depotNo,jdbcType=INTEGER}, | ||
117 | + num = #{num,jdbcType=INTEGER} | ||
94 | where id = #{id,jdbcType=INTEGER} | 118 | where id = #{id,jdbcType=INTEGER} |
95 | </update> | 119 | </update> |
96 | </mapper> | 120 | </mapper> |
@@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
4 | <resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.AppraiseOrder"> | 4 | <resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.AppraiseOrder"> |
5 | <id column="id" jdbcType="INTEGER" property="id" /> | 5 | <id column="id" jdbcType="INTEGER" property="id" /> |
6 | <result column="uid" jdbcType="INTEGER" property="uid" /> | 6 | <result column="uid" jdbcType="INTEGER" property="uid" /> |
7 | + <result column="parent_order_code" jdbcType="BIGINT" property="parentOrderCode" /> | ||
7 | <result column="order_code" jdbcType="BIGINT" property="orderCode" /> | 8 | <result column="order_code" jdbcType="BIGINT" property="orderCode" /> |
8 | <result column="client_type" jdbcType="TINYINT" property="clientType" /> | 9 | <result column="client_type" jdbcType="TINYINT" property="clientType" /> |
9 | <result column="payment" jdbcType="TINYINT" property="payment" /> | 10 | <result column="payment" jdbcType="TINYINT" property="payment" /> |
@@ -14,10 +15,12 @@ | @@ -14,10 +15,12 @@ | ||
14 | <result column="update_time" jdbcType="INTEGER" property="updateTime" /> | 15 | <result column="update_time" jdbcType="INTEGER" property="updateTime" /> |
15 | <result column="is_del" jdbcType="TINYINT" property="isDel" /> | 16 | <result column="is_del" jdbcType="TINYINT" property="isDel" /> |
16 | <result column="channel_no" jdbcType="VARCHAR" property="channelNo" /> | 17 | <result column="channel_no" jdbcType="VARCHAR" property="channelNo" /> |
18 | + <result column="attributes" jdbcType="INTEGER" property="attributes" /> | ||
19 | + <result column="platform_delivery_status" jdbcType="TINYINT" property="platformDeliveryStatus" /> | ||
17 | </resultMap> | 20 | </resultMap> |
18 | <sql id="Base_Column_List"> | 21 | <sql id="Base_Column_List"> |
19 | - id, uid, order_code, client_type, payment, amount, ship_fee, status, create_time, | ||
20 | - update_time, is_del, channel_no | 22 | + id, uid, parent_order_code, order_code, client_type, payment, amount, ship_fee, status, |
23 | + create_time, update_time, is_del, channel_no, attributes, platform_delivery_status | ||
21 | </sql> | 24 | </sql> |
22 | <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | 25 | <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> |
23 | select | 26 | select |
@@ -28,14 +31,16 @@ | @@ -28,14 +31,16 @@ | ||
28 | 31 | ||
29 | 32 | ||
30 | <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrder" useGeneratedKeys="true"> | 33 | <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrder" useGeneratedKeys="true"> |
31 | - insert into appraise_order (uid, order_code, client_type, | ||
32 | - payment, amount, ship_fee, | ||
33 | - status, create_time, update_time, | ||
34 | - is_del, channel_no) | ||
35 | - values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{clientType,jdbcType=TINYINT}, | ||
36 | - #{payment,jdbcType=TINYINT}, #{amount,jdbcType=DECIMAL}, #{shipFee,jdbcType=DECIMAL}, | ||
37 | - #{status,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}, | ||
38 | - #{isDel,jdbcType=TINYINT}, #{channelNo,jdbcType=VARCHAR}) | 34 | + insert into appraise_order (uid, parent_order_code, order_code, |
35 | + client_type, payment, amount, | ||
36 | + ship_fee, status, create_time, | ||
37 | + update_time, is_del, channel_no, | ||
38 | + attributes, platform_delivery_status) | ||
39 | + values (#{uid,jdbcType=INTEGER}, #{parentOrderCode,jdbcType=BIGINT}, #{orderCode,jdbcType=BIGINT}, | ||
40 | + #{clientType,jdbcType=TINYINT}, #{payment,jdbcType=TINYINT}, #{amount,jdbcType=DECIMAL}, | ||
41 | + #{shipFee,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER}, | ||
42 | + #{updateTime,jdbcType=INTEGER}, #{isDel,jdbcType=TINYINT}, #{channelNo,jdbcType=VARCHAR}, | ||
43 | + #{attributes,jdbcType=INTEGER}, #{platformDeliveryStatus,jdbcType=TINYINT}) | ||
39 | </insert> | 44 | </insert> |
40 | <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrder" useGeneratedKeys="true"> | 45 | <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrder" useGeneratedKeys="true"> |
41 | insert into appraise_order | 46 | insert into appraise_order |
@@ -43,6 +48,9 @@ | @@ -43,6 +48,9 @@ | ||
43 | <if test="uid != null"> | 48 | <if test="uid != null"> |
44 | uid, | 49 | uid, |
45 | </if> | 50 | </if> |
51 | + <if test="parentOrderCode != null"> | ||
52 | + parent_order_code, | ||
53 | + </if> | ||
46 | <if test="orderCode != null"> | 54 | <if test="orderCode != null"> |
47 | order_code, | 55 | order_code, |
48 | </if> | 56 | </if> |
@@ -73,11 +81,20 @@ | @@ -73,11 +81,20 @@ | ||
73 | <if test="channelNo != null"> | 81 | <if test="channelNo != null"> |
74 | channel_no, | 82 | channel_no, |
75 | </if> | 83 | </if> |
84 | + <if test="attributes != null"> | ||
85 | + attributes, | ||
86 | + </if> | ||
87 | + <if test="platformDeliveryStatus != null"> | ||
88 | + platform_delivery_status, | ||
89 | + </if> | ||
76 | </trim> | 90 | </trim> |
77 | <trim prefix="values (" suffix=")" suffixOverrides=","> | 91 | <trim prefix="values (" suffix=")" suffixOverrides=","> |
78 | <if test="uid != null"> | 92 | <if test="uid != null"> |
79 | #{uid,jdbcType=INTEGER}, | 93 | #{uid,jdbcType=INTEGER}, |
80 | </if> | 94 | </if> |
95 | + <if test="parentOrderCode != null"> | ||
96 | + #{parentOrderCode,jdbcType=BIGINT}, | ||
97 | + </if> | ||
81 | <if test="orderCode != null"> | 98 | <if test="orderCode != null"> |
82 | #{orderCode,jdbcType=BIGINT}, | 99 | #{orderCode,jdbcType=BIGINT}, |
83 | </if> | 100 | </if> |
@@ -108,6 +125,12 @@ | @@ -108,6 +125,12 @@ | ||
108 | <if test="channelNo != null"> | 125 | <if test="channelNo != null"> |
109 | #{channelNo,jdbcType=VARCHAR}, | 126 | #{channelNo,jdbcType=VARCHAR}, |
110 | </if> | 127 | </if> |
128 | + <if test="attributes != null"> | ||
129 | + #{attributes,jdbcType=INTEGER}, | ||
130 | + </if> | ||
131 | + <if test="platformDeliveryStatus != null"> | ||
132 | + #{platformDeliveryStatus,jdbcType=TINYINT}, | ||
133 | + </if> | ||
111 | </trim> | 134 | </trim> |
112 | </insert> | 135 | </insert> |
113 | <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrder"> | 136 | <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrder"> |
@@ -116,6 +139,9 @@ | @@ -116,6 +139,9 @@ | ||
116 | <if test="uid != null"> | 139 | <if test="uid != null"> |
117 | uid = #{uid,jdbcType=INTEGER}, | 140 | uid = #{uid,jdbcType=INTEGER}, |
118 | </if> | 141 | </if> |
142 | + <if test="parentOrderCode != null"> | ||
143 | + parent_order_code = #{parentOrderCode,jdbcType=BIGINT}, | ||
144 | + </if> | ||
119 | <if test="orderCode != null"> | 145 | <if test="orderCode != null"> |
120 | order_code = #{orderCode,jdbcType=BIGINT}, | 146 | order_code = #{orderCode,jdbcType=BIGINT}, |
121 | </if> | 147 | </if> |
@@ -146,12 +172,19 @@ | @@ -146,12 +172,19 @@ | ||
146 | <if test="channelNo != null"> | 172 | <if test="channelNo != null"> |
147 | channel_no = #{channelNo,jdbcType=VARCHAR}, | 173 | channel_no = #{channelNo,jdbcType=VARCHAR}, |
148 | </if> | 174 | </if> |
175 | + <if test="attributes != null"> | ||
176 | + attributes = #{attributes,jdbcType=INTEGER}, | ||
177 | + </if> | ||
178 | + <if test="platformDeliveryStatus != null"> | ||
179 | + platform_delivery_status = #{platformDeliveryStatus,jdbcType=TINYINT}, | ||
180 | + </if> | ||
149 | </set> | 181 | </set> |
150 | where id = #{id,jdbcType=INTEGER} | 182 | where id = #{id,jdbcType=INTEGER} |
151 | </update> | 183 | </update> |
152 | <update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.AppraiseOrder"> | 184 | <update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.AppraiseOrder"> |
153 | update appraise_order | 185 | update appraise_order |
154 | set uid = #{uid,jdbcType=INTEGER}, | 186 | set uid = #{uid,jdbcType=INTEGER}, |
187 | + parent_order_code = #{parentOrderCode,jdbcType=BIGINT}, | ||
155 | order_code = #{orderCode,jdbcType=BIGINT}, | 188 | order_code = #{orderCode,jdbcType=BIGINT}, |
156 | client_type = #{clientType,jdbcType=TINYINT}, | 189 | client_type = #{clientType,jdbcType=TINYINT}, |
157 | payment = #{payment,jdbcType=TINYINT}, | 190 | payment = #{payment,jdbcType=TINYINT}, |
@@ -161,7 +194,9 @@ | @@ -161,7 +194,9 @@ | ||
161 | create_time = #{createTime,jdbcType=INTEGER}, | 194 | create_time = #{createTime,jdbcType=INTEGER}, |
162 | update_time = #{updateTime,jdbcType=INTEGER}, | 195 | update_time = #{updateTime,jdbcType=INTEGER}, |
163 | is_del = #{isDel,jdbcType=TINYINT}, | 196 | is_del = #{isDel,jdbcType=TINYINT}, |
164 | - channel_no = #{channelNo,jdbcType=VARCHAR} | 197 | + channel_no = #{channelNo,jdbcType=VARCHAR}, |
198 | + attributes = #{attributes,jdbcType=INTEGER}, | ||
199 | + platform_delivery_status = #{platformDeliveryStatus,jdbcType=TINYINT} | ||
165 | where id = #{id,jdbcType=INTEGER} | 200 | where id = #{id,jdbcType=INTEGER} |
166 | </update> | 201 | </update> |
167 | </mapper> | 202 | </mapper> |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
3 | +<mapper namespace="com.yohoufo.dal.order.AppraiseOrderMetaMapper"> | ||
4 | + <resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.AppraiseOrderMeta"> | ||
5 | + <id column="id" jdbcType="INTEGER" property="id" /> | ||
6 | + <result column="uid" jdbcType="INTEGER" property="uid" /> | ||
7 | + <result column="order_code" jdbcType="BIGINT" property="orderCode" /> | ||
8 | + <result column="storage_id" jdbcType="INTEGER" property="storageId" /> | ||
9 | + <result column="meta_key" jdbcType="VARCHAR" property="metaKey" /> | ||
10 | + <result column="meta_value" jdbcType="VARCHAR" property="metaValue" /> | ||
11 | + </resultMap> | ||
12 | + <sql id="Base_Column_List"> | ||
13 | + id, uid, order_code, storage_id, meta_key, meta_value | ||
14 | + </sql> | ||
15 | + <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | ||
16 | + select | ||
17 | + <include refid="Base_Column_List" /> | ||
18 | + from appraise_order_meta | ||
19 | + where id = #{id,jdbcType=INTEGER} | ||
20 | + </select> | ||
21 | + | ||
22 | + | ||
23 | + <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderMeta" useGeneratedKeys="true"> | ||
24 | + insert into appraise_order_meta (uid, order_code, storage_id, | ||
25 | + meta_key, meta_value) | ||
26 | + values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{storageId,jdbcType=INTEGER}, | ||
27 | + #{metaKey,jdbcType=VARCHAR}, #{metaValue,jdbcType=VARCHAR}) | ||
28 | + </insert> | ||
29 | + <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderMeta" useGeneratedKeys="true"> | ||
30 | + insert into appraise_order_meta | ||
31 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
32 | + <if test="uid != null"> | ||
33 | + uid, | ||
34 | + </if> | ||
35 | + <if test="orderCode != null"> | ||
36 | + order_code, | ||
37 | + </if> | ||
38 | + <if test="storageId != null"> | ||
39 | + storage_id, | ||
40 | + </if> | ||
41 | + <if test="metaKey != null"> | ||
42 | + meta_key, | ||
43 | + </if> | ||
44 | + <if test="metaValue != null"> | ||
45 | + meta_value, | ||
46 | + </if> | ||
47 | + </trim> | ||
48 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
49 | + <if test="uid != null"> | ||
50 | + #{uid,jdbcType=INTEGER}, | ||
51 | + </if> | ||
52 | + <if test="orderCode != null"> | ||
53 | + #{orderCode,jdbcType=BIGINT}, | ||
54 | + </if> | ||
55 | + <if test="storageId != null"> | ||
56 | + #{storageId,jdbcType=INTEGER}, | ||
57 | + </if> | ||
58 | + <if test="metaKey != null"> | ||
59 | + #{metaKey,jdbcType=VARCHAR}, | ||
60 | + </if> | ||
61 | + <if test="metaValue != null"> | ||
62 | + #{metaValue,jdbcType=VARCHAR}, | ||
63 | + </if> | ||
64 | + </trim> | ||
65 | + </insert> | ||
66 | + <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrderMeta"> | ||
67 | + update appraise_order_meta | ||
68 | + <set> | ||
69 | + <if test="uid != null"> | ||
70 | + uid = #{uid,jdbcType=INTEGER}, | ||
71 | + </if> | ||
72 | + <if test="orderCode != null"> | ||
73 | + order_code = #{orderCode,jdbcType=BIGINT}, | ||
74 | + </if> | ||
75 | + <if test="storageId != null"> | ||
76 | + storage_id = #{storageId,jdbcType=INTEGER}, | ||
77 | + </if> | ||
78 | + <if test="metaKey != null"> | ||
79 | + meta_key = #{metaKey,jdbcType=VARCHAR}, | ||
80 | + </if> | ||
81 | + <if test="metaValue != null"> | ||
82 | + meta_value = #{metaValue,jdbcType=VARCHAR}, | ||
83 | + </if> | ||
84 | + </set> | ||
85 | + where id = #{id,jdbcType=INTEGER} | ||
86 | + </update> | ||
87 | + <update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.AppraiseOrderMeta"> | ||
88 | + update appraise_order_meta | ||
89 | + set uid = #{uid,jdbcType=INTEGER}, | ||
90 | + order_code = #{orderCode,jdbcType=BIGINT}, | ||
91 | + storage_id = #{storageId,jdbcType=INTEGER}, | ||
92 | + meta_key = #{metaKey,jdbcType=VARCHAR}, | ||
93 | + meta_value = #{metaValue,jdbcType=VARCHAR} | ||
94 | + where id = #{id,jdbcType=INTEGER} | ||
95 | + </update> | ||
96 | +</mapper> |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
3 | +<mapper namespace="com.yohoufo.dal.order.AppraiseOrderStorageMapper"> | ||
4 | + <resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.AppraiseOrderStorage"> | ||
5 | + <id column="id" jdbcType="INTEGER" property="id" /> | ||
6 | + <result column="order_code" jdbcType="BIGINT" property="orderCode" /> | ||
7 | + <result column="product_id" jdbcType="INTEGER" property="productId" /> | ||
8 | + <result column="size_id" jdbcType="INTEGER" property="sizeId" /> | ||
9 | + <result column="size_name" jdbcType="VARCHAR" property="sizeName" /> | ||
10 | + <result column="color_id" jdbcType="INTEGER" property="colorId" /> | ||
11 | + <result column="color_name" jdbcType="VARCHAR" property="colorName" /> | ||
12 | + <result column="storage_id" jdbcType="INTEGER" property="storageId" /> | ||
13 | + <result column="num" jdbcType="INTEGER" property="num" /> | ||
14 | + </resultMap> | ||
15 | + <sql id="Base_Column_List"> | ||
16 | + id, order_code, product_id, size_id, size_name, color_id, color_name, storage_id, | ||
17 | + num | ||
18 | + </sql> | ||
19 | + <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | ||
20 | + select | ||
21 | + <include refid="Base_Column_List" /> | ||
22 | + from appraise_order_storage | ||
23 | + where id = #{id,jdbcType=INTEGER} | ||
24 | + </select> | ||
25 | + | ||
26 | + <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderStorage" useGeneratedKeys="true"> | ||
27 | + insert into appraise_order_storage (order_code, product_id, size_id, | ||
28 | + size_name, color_id, color_name, | ||
29 | + storage_id, num) | ||
30 | + values (#{orderCode,jdbcType=BIGINT}, #{productId,jdbcType=INTEGER}, #{sizeId,jdbcType=INTEGER}, | ||
31 | + #{sizeName,jdbcType=VARCHAR}, #{colorId,jdbcType=INTEGER}, #{colorName,jdbcType=VARCHAR}, | ||
32 | + #{storageId,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}) | ||
33 | + </insert> | ||
34 | + | ||
35 | + <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.AppraiseOrderStorage" useGeneratedKeys="true"> | ||
36 | + insert into appraise_order_storage | ||
37 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
38 | + <if test="orderCode != null"> | ||
39 | + order_code, | ||
40 | + </if> | ||
41 | + <if test="productId != null"> | ||
42 | + product_id, | ||
43 | + </if> | ||
44 | + <if test="sizeId != null"> | ||
45 | + size_id, | ||
46 | + </if> | ||
47 | + <if test="sizeName != null"> | ||
48 | + size_name, | ||
49 | + </if> | ||
50 | + <if test="colorId != null"> | ||
51 | + color_id, | ||
52 | + </if> | ||
53 | + <if test="colorName != null"> | ||
54 | + color_name, | ||
55 | + </if> | ||
56 | + <if test="storageId != null"> | ||
57 | + storage_id, | ||
58 | + </if> | ||
59 | + <if test="num != null"> | ||
60 | + num, | ||
61 | + </if> | ||
62 | + </trim> | ||
63 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
64 | + <if test="orderCode != null"> | ||
65 | + #{orderCode,jdbcType=BIGINT}, | ||
66 | + </if> | ||
67 | + <if test="productId != null"> | ||
68 | + #{productId,jdbcType=INTEGER}, | ||
69 | + </if> | ||
70 | + <if test="sizeId != null"> | ||
71 | + #{sizeId,jdbcType=INTEGER}, | ||
72 | + </if> | ||
73 | + <if test="sizeName != null"> | ||
74 | + #{sizeName,jdbcType=VARCHAR}, | ||
75 | + </if> | ||
76 | + <if test="colorId != null"> | ||
77 | + #{colorId,jdbcType=INTEGER}, | ||
78 | + </if> | ||
79 | + <if test="colorName != null"> | ||
80 | + #{colorName,jdbcType=VARCHAR}, | ||
81 | + </if> | ||
82 | + <if test="storageId != null"> | ||
83 | + #{storageId,jdbcType=INTEGER}, | ||
84 | + </if> | ||
85 | + <if test="num != null"> | ||
86 | + #{num,jdbcType=INTEGER}, | ||
87 | + </if> | ||
88 | + </trim> | ||
89 | + </insert> | ||
90 | + <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.AppraiseOrderStorage"> | ||
91 | + update appraise_order_storage | ||
92 | + <set> | ||
93 | + <if test="orderCode != null"> | ||
94 | + order_code = #{orderCode,jdbcType=BIGINT}, | ||
95 | + </if> | ||
96 | + <if test="productId != null"> | ||
97 | + product_id = #{productId,jdbcType=INTEGER}, | ||
98 | + </if> | ||
99 | + <if test="sizeId != null"> | ||
100 | + size_id = #{sizeId,jdbcType=INTEGER}, | ||
101 | + </if> | ||
102 | + <if test="sizeName != null"> | ||
103 | + size_name = #{sizeName,jdbcType=VARCHAR}, | ||
104 | + </if> | ||
105 | + <if test="colorId != null"> | ||
106 | + color_id = #{colorId,jdbcType=INTEGER}, | ||
107 | + </if> | ||
108 | + <if test="colorName != null"> | ||
109 | + color_name = #{colorName,jdbcType=VARCHAR}, | ||
110 | + </if> | ||
111 | + <if test="storageId != null"> | ||
112 | + storage_id = #{storageId,jdbcType=INTEGER}, | ||
113 | + </if> | ||
114 | + <if test="num != null"> | ||
115 | + num = #{num,jdbcType=INTEGER}, | ||
116 | + </if> | ||
117 | + </set> | ||
118 | + where id = #{id,jdbcType=INTEGER} | ||
119 | + </update> | ||
120 | + <update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.AppraiseOrderStorage"> | ||
121 | + update appraise_order_storage | ||
122 | + set order_code = #{orderCode,jdbcType=BIGINT}, | ||
123 | + product_id = #{productId,jdbcType=INTEGER}, | ||
124 | + size_id = #{sizeId,jdbcType=INTEGER}, | ||
125 | + size_name = #{sizeName,jdbcType=VARCHAR}, | ||
126 | + color_id = #{colorId,jdbcType=INTEGER}, | ||
127 | + color_name = #{colorName,jdbcType=VARCHAR}, | ||
128 | + storage_id = #{storageId,jdbcType=INTEGER}, | ||
129 | + num = #{num,jdbcType=INTEGER} | ||
130 | + where id = #{id,jdbcType=INTEGER} | ||
131 | + </update> | ||
132 | +</mapper> |
@@ -31,14 +31,14 @@ public class AppraiseOrderController { | @@ -31,14 +31,14 @@ public class AppraiseOrderController { | ||
31 | * @param productId | 31 | * @param productId |
32 | * @return | 32 | * @return |
33 | */ | 33 | */ |
34 | - @RequestMapping(params = "method=ufo.appriseOrder.compute") | 34 | + @RequestMapping(params = "method=ufo.appraiseOrder.compute") |
35 | public ApiResponse compute(@RequestParam(name = "uid")int uid, | 35 | public ApiResponse compute(@RequestParam(name = "uid")int uid, |
36 | @RequestParam(name = "productId")int productId){ | 36 | @RequestParam(name = "productId")int productId){ |
37 | AppraiseOrderComputeReq req = AppraiseOrderComputeReq.builder() | 37 | AppraiseOrderComputeReq req = AppraiseOrderComputeReq.builder() |
38 | .uid(uid) | 38 | .uid(uid) |
39 | .productId(productId) | 39 | .productId(productId) |
40 | .build(); | 40 | .build(); |
41 | - logger.info("in ufo.appriseOrder.compute req {}", req); | 41 | + logger.info("in ufo.appraiseOrder.compute req {}", req); |
42 | AppraiseOrderComputeResp resp = appraiseOrderService.compute(req); | 42 | AppraiseOrderComputeResp resp = appraiseOrderService.compute(req); |
43 | return new ApiResponse.ApiResponseBuilder() | 43 | return new ApiResponse.ApiResponseBuilder() |
44 | .code(200) | 44 | .code(200) |
@@ -48,13 +48,13 @@ public class AppraiseOrderController { | @@ -48,13 +48,13 @@ public class AppraiseOrderController { | ||
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | - @RequestMapping(params = "method=ufo.appriseOrder.submit") | 51 | + @RequestMapping(params = "method=ufo.appraiseOrder.submit") |
52 | public ApiResponse submit(@RequestParam(name = "uid")int uid, | 52 | public ApiResponse submit(@RequestParam(name = "uid")int uid, |
53 | @RequestParam(name = "productId")int productId, | 53 | @RequestParam(name = "productId")int productId, |
54 | @RequestParam(name = "addressId") String addressId){ | 54 | @RequestParam(name = "addressId") String addressId){ |
55 | AppraiseOrderSubmitReq req = AppraiseOrderSubmitReq.builder() | 55 | AppraiseOrderSubmitReq req = AppraiseOrderSubmitReq.builder() |
56 | .uid(uid).productId(productId).addressId(addressId).build(); | 56 | .uid(uid).productId(productId).addressId(addressId).build(); |
57 | - logger.info("in ufo.appriseOrder.submit req {}", req); | 57 | + logger.info("in ufo.appraiseOrder.submit req {}", req); |
58 | AppraiseOrderSubmitResp resp = appraiseOrderService.submit(req); | 58 | AppraiseOrderSubmitResp resp = appraiseOrderService.submit(req); |
59 | return new ApiResponse.ApiResponseBuilder() | 59 | return new ApiResponse.ApiResponseBuilder() |
60 | .code(200) | 60 | .code(200) |
@@ -69,7 +69,7 @@ public class AppraiseOrderController { | @@ -69,7 +69,7 @@ public class AppraiseOrderController { | ||
69 | * @param uid | 69 | * @param uid |
70 | * @return | 70 | * @return |
71 | */ | 71 | */ |
72 | - @RequestMapping(params = "method=ufo.appriseOrder.list") | 72 | + @RequestMapping(params = "method=ufo.appraiseOrder.list") |
73 | public ApiResponse list(@RequestParam(name = "uid")int uid, | 73 | public ApiResponse list(@RequestParam(name = "uid")int uid, |
74 | @RequestParam(value = "page", required = false, defaultValue = "1") int page, | 74 | @RequestParam(value = "page", required = false, defaultValue = "1") int page, |
75 | @RequestParam(value = "limit", required = false, defaultValue = "10") int limit){ | 75 | @RequestParam(value = "limit", required = false, defaultValue = "10") int limit){ |
@@ -77,7 +77,7 @@ public class AppraiseOrderController { | @@ -77,7 +77,7 @@ public class AppraiseOrderController { | ||
77 | AppraiseOrderListReq req = AppraiseOrderListReq.builder() | 77 | AppraiseOrderListReq req = AppraiseOrderListReq.builder() |
78 | .uid(uid).limit(limit).page(page).build(); | 78 | .uid(uid).limit(limit).page(page).build(); |
79 | 79 | ||
80 | - logger.info("in ufo.appriseOrder.list req {}", req); | 80 | + logger.info("in ufo.appraiseOrder.list req {}", req); |
81 | AppraiseOrderListResp resp = appraiseOrderService.getOrderList(req); | 81 | AppraiseOrderListResp resp = appraiseOrderService.getOrderList(req); |
82 | return new ApiResponse.ApiResponseBuilder() | 82 | return new ApiResponse.ApiResponseBuilder() |
83 | .code(200) | 83 | .code(200) |
@@ -87,11 +87,11 @@ public class AppraiseOrderController { | @@ -87,11 +87,11 @@ public class AppraiseOrderController { | ||
87 | } | 87 | } |
88 | 88 | ||
89 | 89 | ||
90 | - @RequestMapping(params = "method=ufo.appriseOrder.detail") | 90 | + @RequestMapping(params = "method=ufo.appraiseOrder.detail") |
91 | public ApiResponse detail(@RequestParam(name = "uid")int uid, | 91 | public ApiResponse detail(@RequestParam(name = "uid")int uid, |
92 | @RequestParam(name = "orderCode")long orderCode){ | 92 | @RequestParam(name = "orderCode")long orderCode){ |
93 | AppraiseOrderDetailReq req = AppraiseOrderDetailReq.builder().uid(uid).orderCode(orderCode).build(); | 93 | AppraiseOrderDetailReq req = AppraiseOrderDetailReq.builder().uid(uid).orderCode(orderCode).build(); |
94 | - logger.info("in ufo.appriseOrder.detail req {}", req); | 94 | + logger.info("in ufo.appraiseOrder.detail req {}", req); |
95 | AppraiseOrderDetailResp resp = appraiseOrderService.getOrderDetail(req); | 95 | AppraiseOrderDetailResp resp = appraiseOrderService.getOrderDetail(req); |
96 | return new ApiResponse.ApiResponseBuilder() | 96 | return new ApiResponse.ApiResponseBuilder() |
97 | .code(200) | 97 | .code(200) |
1 | +package com.yohoufo.order.controller; | ||
2 | + | ||
3 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderComputeReq; | ||
4 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderDetailReq; | ||
5 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderListReq; | ||
6 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderSubmitReq; | ||
7 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderComputeResp; | ||
8 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderDetailResp; | ||
9 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderListResp; | ||
10 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderSubmitResp; | ||
11 | +import com.yohoufo.common.ApiResponse; | ||
12 | +import com.yohoufo.order.service.seller.deposit.SellerDepositOrderService; | ||
13 | +import com.yohoufo.order.utils.LoggerUtils; | ||
14 | +import org.slf4j.Logger; | ||
15 | +import org.springframework.beans.factory.annotation.Autowired; | ||
16 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
17 | +import org.springframework.web.bind.annotation.RequestParam; | ||
18 | +import org.springframework.web.bind.annotation.RestController; | ||
19 | + | ||
20 | +@RestController | ||
21 | +public class SellerDepositOrderController { | ||
22 | + | ||
23 | + | ||
24 | + private Logger logger = LoggerUtils.getSellerOrderLogger(); | ||
25 | + @Autowired | ||
26 | + private SellerDepositOrderService sellerDepositOrderService; | ||
27 | + | ||
28 | + @RequestMapping(params = "method=ufo.depositOrder.compute") | ||
29 | + public ApiResponse compute(@RequestParam(name = "uid")int uid, | ||
30 | + @RequestParam(name = "goodsList")String goodsList){ | ||
31 | + SellerDepositOrderComputeReq req = SellerDepositOrderComputeReq.builder() | ||
32 | + .uid(uid).goodsList(goodsList).build(); | ||
33 | + logger.info("in ufo.depositOrder.compute req {}", req); | ||
34 | + SellerDepositOrderComputeResp resp = sellerDepositOrderService.compute(req); | ||
35 | + return new ApiResponse.ApiResponseBuilder() | ||
36 | + .code(200) | ||
37 | + .data(resp) | ||
38 | + .message("寄存计算成功") | ||
39 | + .build(); | ||
40 | + } | ||
41 | + | ||
42 | + | ||
43 | + @RequestMapping(params = "method=ufo.depositOrder.submit") | ||
44 | + public ApiResponse submit(@RequestParam(name = "uid")int uid, | ||
45 | + @RequestParam(name = "goodsList")String goodsList, | ||
46 | + @RequestParam(name = "addressId") String addressId){ | ||
47 | + SellerDepositOrderSubmitReq req = SellerDepositOrderSubmitReq.builder() | ||
48 | + .uid(uid).goodsList(goodsList).addressId(addressId).build(); | ||
49 | + logger.info("in ufo.depositOrder.submit req {}", req); | ||
50 | + SellerDepositOrderSubmitResp resp = sellerDepositOrderService.submit(req); | ||
51 | + return new ApiResponse.ApiResponseBuilder() | ||
52 | + .code(200) | ||
53 | + .data(resp) | ||
54 | + .message("寄存订单提交成功") | ||
55 | + .build(); | ||
56 | + } | ||
57 | + | ||
58 | + | ||
59 | + /** | ||
60 | + * 商品付费寄存列表 | ||
61 | + * @param uid | ||
62 | + * @return | ||
63 | + */ | ||
64 | + @RequestMapping(params = "method=ufo.depositOrder.list") | ||
65 | + public ApiResponse list(@RequestParam(name = "uid")int uid, | ||
66 | + @RequestParam(value = "page", required = false, defaultValue = "1") int page, | ||
67 | + @RequestParam(value = "limit", required = false, defaultValue = "10") int limit){ | ||
68 | + | ||
69 | + SellerDepositOrderListReq req = SellerDepositOrderListReq.builder() | ||
70 | + .uid(uid).limit(limit).page(page).build(); | ||
71 | + | ||
72 | + logger.info("in ufo.depositOrder.list req {}", req); | ||
73 | + SellerDepositOrderListResp resp = sellerDepositOrderService.getOrderList(req); | ||
74 | + return new ApiResponse.ApiResponseBuilder() | ||
75 | + .code(200) | ||
76 | + .data(resp) | ||
77 | + .message("寄存订单列表查询成功") | ||
78 | + .build(); | ||
79 | + } | ||
80 | + | ||
81 | + | ||
82 | + @RequestMapping(params = "method=ufo.depositOrder.detail") | ||
83 | + public ApiResponse detail(@RequestParam(name = "uid")int uid, | ||
84 | + @RequestParam(name = "orderCode")long orderCode){ | ||
85 | + SellerDepositOrderDetailReq req = SellerDepositOrderDetailReq.builder() | ||
86 | + .uid(uid).orderCode(orderCode).build(); | ||
87 | + logger.info("in ufo.depositOrder.detail req {}", req); | ||
88 | + SellerDepositOrderDetailResp resp = sellerDepositOrderService.getOrderDetail(req); | ||
89 | + return new ApiResponse.ApiResponseBuilder() | ||
90 | + .code(200) | ||
91 | + .data(resp) | ||
92 | + .message("寄存订单详情查询成功") | ||
93 | + .build(); | ||
94 | + } | ||
95 | +} |
order/src/main/java/com/yohoufo/order/service/seller/deposit/SellerDepositOrderService.java
0 → 100644
1 | +package com.yohoufo.order.service.seller.deposit; | ||
2 | + | ||
3 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderComputeReq; | ||
4 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderDetailReq; | ||
5 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderListReq; | ||
6 | +import com.yohobuy.ufo.model.order.req.SellerDepositOrderSubmitReq; | ||
7 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderComputeResp; | ||
8 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderDetailResp; | ||
9 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderListResp; | ||
10 | +import com.yohobuy.ufo.model.order.resp.SellerDepositOrderSubmitResp; | ||
11 | +import org.springframework.stereotype.Service; | ||
12 | + | ||
13 | +@Service | ||
14 | +public class SellerDepositOrderService { | ||
15 | + | ||
16 | + public SellerDepositOrderComputeResp compute(SellerDepositOrderComputeReq req){ | ||
17 | + return null; | ||
18 | + } | ||
19 | + | ||
20 | + | ||
21 | + public SellerDepositOrderSubmitResp submit(SellerDepositOrderSubmitReq req){ | ||
22 | + return null; | ||
23 | + } | ||
24 | + | ||
25 | + | ||
26 | + | ||
27 | + public SellerDepositOrderListResp getOrderList(SellerDepositOrderListReq req ){ | ||
28 | + return null; | ||
29 | + } | ||
30 | + | ||
31 | + | ||
32 | + public SellerDepositOrderDetailResp getOrderDetail(SellerDepositOrderDetailReq req){ | ||
33 | + return null; | ||
34 | + } | ||
35 | +} |
@@ -115,6 +115,8 @@ datasources: | @@ -115,6 +115,8 @@ datasources: | ||
115 | - com.yohoufo.dal.order.AlipayBlackUserMapper | 115 | - com.yohoufo.dal.order.AlipayBlackUserMapper |
116 | - com.yohoufo.dal.order.AppraiseOrderMapper | 116 | - com.yohoufo.dal.order.AppraiseOrderMapper |
117 | - com.yohoufo.dal.order.AppraiseOrderGoodsMapper | 117 | - com.yohoufo.dal.order.AppraiseOrderGoodsMapper |
118 | + - com.yohoufo.dal.order.AppraiseOrderMetaMapper | ||
119 | + - com.yohoufo.dal.order.AppraiseOrderStorageMapper | ||
118 | 120 | ||
119 | ufo_promotion: | 121 | ufo_promotion: |
120 | servers: | 122 | servers: |
@@ -114,6 +114,8 @@ datasources: | @@ -114,6 +114,8 @@ datasources: | ||
114 | - com.yohoufo.dal.order.AlipayBlackUserMapper | 114 | - com.yohoufo.dal.order.AlipayBlackUserMapper |
115 | - com.yohoufo.dal.order.AppraiseOrderMapper | 115 | - com.yohoufo.dal.order.AppraiseOrderMapper |
116 | - com.yohoufo.dal.order.AppraiseOrderGoodsMapper | 116 | - com.yohoufo.dal.order.AppraiseOrderGoodsMapper |
117 | + - com.yohoufo.dal.order.AppraiseOrderMetaMapper | ||
118 | + - com.yohoufo.dal.order.AppraiseOrderStorageMapper | ||
117 | 119 | ||
118 | ufo_promotion: | 120 | ufo_promotion: |
119 | servers: | 121 | servers: |
-
Please register or login to post a comment