lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下单接口完善，添加支付成功回调及自动取消超时订单接口

Browse Source
This commit is contained in:
zhh
2018-09-05 17:05:11 +08:00
parent cae7f7e4f8
commit cbdb93ee3f
21 changed files with 872 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java
View File

@@ -261,6 +261,13 @@ public class OmsOrder implements Serializable {
*/
private Integer deleteStatus;
/**
* 下单时使用的积分
*
* @mbggenerated
*/
private Integer useIntegration;
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -567,6 +574,14 @@ public class OmsOrder implements Serializable {
this.deleteStatus = deleteStatus;
}
public Integer getUseIntegration() {
return useIntegration;
}
public void setUseIntegration(Integer useIntegration) {
this.useIntegration = useIntegration;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -611,6 +626,7 @@ public class OmsOrder implements Serializable {
sb.append(", note=").append(note);
sb.append(", confirmStatus=").append(confirmStatus);
sb.append(", deleteStatus=").append(deleteStatus);
sb.append(", useIntegration=").append(useIntegration);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

60
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java
View File

@@ -2555,6 +2555,66 @@ public class OmsOrderExample {
addCriterion("delete_status not between", value1, value2, "deleteStatus");
return (Criteria) this;
}
public Criteria andUseIntegrationIsNull() {
addCriterion("use_integration is null");
return (Criteria) this;
}
public Criteria andUseIntegrationIsNotNull() {
addCriterion("use_integration is not null");
return (Criteria) this;
}
public Criteria andUseIntegrationEqualTo(Integer value) {
addCriterion("use_integration =", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationNotEqualTo(Integer value) {
addCriterion("use_integration <>", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationGreaterThan(Integer value) {
addCriterion("use_integration >", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationGreaterThanOrEqualTo(Integer value) {
addCriterion("use_integration >=", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationLessThan(Integer value) {
addCriterion("use_integration <", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationLessThanOrEqualTo(Integer value) {
addCriterion("use_integration <=", value, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationIn(List<Integer> values) {
addCriterion("use_integration in", values, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationNotIn(List<Integer> values) {
addCriterion("use_integration not in", values, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationBetween(Integer value1, Integer value2) {
addCriterion("use_integration between", value1, value2, "useIntegration");
return (Criteria) this;
}
public Criteria andUseIntegrationNotBetween(Integer value1, Integer value2) {
addCriterion("use_integration not between", value1, value2, "useIntegration");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

26
mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml
View File

@@ -40,6 +40,7 @@
<result column="note" jdbcType="VARCHAR" property="note" />
<result column="confirm_status" jdbcType="INTEGER" property="confirmStatus" />
<result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
<result column="use_integration" jdbcType="INTEGER" property="useIntegration" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@@ -105,7 +106,8 @@
pay_type, source_type, status, order_type, delivery_company, delivery_sn, auto_confirm_day,
integration, growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone,
bill_receiver_email, receiver_name, receiver_phone, receiver_post_code, receiver_province,
receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status
receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status,
use_integration
</sql>
<select id="selectByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultMap="BaseResultMap">
select
@@ -153,7 +155,7 @@
receiver_name, receiver_phone, receiver_post_code,
receiver_province, receiver_city, receiver_region,
receiver_detail_address, note, confirm_status,
delete_status)
delete_status, use_integration)
values (#{memberId,jdbcType=BIGINT}, #{couponId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL},
#{payAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL},
@@ -166,7 +168,7 @@
#{receiverName,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{receiverPostCode,jdbcType=VARCHAR},
#{receiverProvince,jdbcType=VARCHAR}, #{receiverCity,jdbcType=VARCHAR}, #{receiverRegion,jdbcType=VARCHAR},
#{receiverDetailAddress,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{confirmStatus,jdbcType=INTEGER},
#{deleteStatus,jdbcType=INTEGER})
#{deleteStatus,jdbcType=INTEGER}, #{useIntegration,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.macro.mall.model.OmsOrder">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -285,6 +287,9 @@
<if test="deleteStatus != null">
delete_status,
</if>
<if test="useIntegration != null">
use_integration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="memberId != null">
@@ -398,6 +403,9 @@
<if test="deleteStatus != null">
#{deleteStatus,jdbcType=INTEGER},
</if>
<if test="useIntegration != null">
#{useIntegration,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultType="java.lang.Integer">
@@ -523,6 +531,9 @@
<if test="record.deleteStatus != null">
delete_status = #{record.deleteStatus,jdbcType=INTEGER},
</if>
<if test="record.useIntegration != null">
use_integration = #{record.useIntegration,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@@ -567,7 +578,8 @@
receiver_detail_address = #{record.receiverDetailAddress,jdbcType=VARCHAR},
note = #{record.note,jdbcType=VARCHAR},
confirm_status = #{record.confirmStatus,jdbcType=INTEGER},
delete_status = #{record.deleteStatus,jdbcType=INTEGER}
delete_status = #{record.deleteStatus,jdbcType=INTEGER},
use_integration = #{record.useIntegration,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -686,6 +698,9 @@
<if test="deleteStatus != null">
delete_status = #{deleteStatus,jdbcType=INTEGER},
</if>
<if test="useIntegration != null">
use_integration = #{useIntegration,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -727,7 +742,8 @@
receiver_detail_address = #{receiverDetailAddress,jdbcType=VARCHAR},
note = #{note,jdbcType=VARCHAR},
confirm_status = #{confirmStatus,jdbcType=INTEGER},
delete_status = #{deleteStatus,jdbcType=INTEGER}
delete_status = #{deleteStatus,jdbcType=INTEGER},
use_integration = #{useIntegration,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>