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

添加生成确认单接口

Browse Source
This commit is contained in:
zhh
2018-08-30 16:22:22 +08:00
parent 61a67c9aa9
commit b33f396d53
15 changed files with 1026 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.java Normal file
View File

@@ -0,0 +1,30 @@
package com.macro.mall.mapper;
import com.macro.mall.model.UmsIntegrationConsumeSetting;
import com.macro.mall.model.UmsIntegrationConsumeSettingExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface UmsIntegrationConsumeSettingMapper {
int countByExample(UmsIntegrationConsumeSettingExample example);
int deleteByExample(UmsIntegrationConsumeSettingExample example);
int deleteByPrimaryKey(Long id);
int insert(UmsIntegrationConsumeSetting record);
int insertSelective(UmsIntegrationConsumeSetting record);
List<UmsIntegrationConsumeSetting> selectByExample(UmsIntegrationConsumeSettingExample example);
UmsIntegrationConsumeSetting selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") UmsIntegrationConsumeSetting record, @Param("example") UmsIntegrationConsumeSettingExample example);
int updateByExample(@Param("record") UmsIntegrationConsumeSetting record, @Param("example") UmsIntegrationConsumeSettingExample example);
int updateByPrimaryKeySelective(UmsIntegrationConsumeSetting record);
int updateByPrimaryKey(UmsIntegrationConsumeSetting record);
}

30
mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.java
View File

@@ -1,30 +0,0 @@
package com.macro.mall.mapper;
import com.macro.mall.model.UmsIntergrationConsumeSetting;
import com.macro.mall.model.UmsIntergrationConsumeSettingExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface UmsIntergrationConsumeSettingMapper {
int countByExample(UmsIntergrationConsumeSettingExample example);
int deleteByExample(UmsIntergrationConsumeSettingExample example);
int deleteByPrimaryKey(Long id);
int insert(UmsIntergrationConsumeSetting record);
int insertSelective(UmsIntergrationConsumeSetting record);
List<UmsIntergrationConsumeSetting> selectByExample(UmsIntergrationConsumeSettingExample example);
UmsIntergrationConsumeSetting selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") UmsIntergrationConsumeSetting record, @Param("example") UmsIntergrationConsumeSettingExample example);
int updateByExample(@Param("record") UmsIntergrationConsumeSetting record, @Param("example") UmsIntergrationConsumeSettingExample example);
int updateByPrimaryKeySelective(UmsIntergrationConsumeSetting record);
int updateByPrimaryKey(UmsIntergrationConsumeSetting record);
}

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

@@ -44,6 +44,13 @@ public class OmsOrder implements Serializable {
*/
private BigDecimal totalAmount;
/**
* 应付金额（实际支付金额）
*
* @mbggenerated
*/
private BigDecimal payAmount;
/**
* 运费金额
*
@@ -247,6 +254,13 @@ public class OmsOrder implements Serializable {
*/
private Integer confirmStatus;
/**
* 删除状态：0->未删除；1->已删除
*
* @mbggenerated
*/
private Integer deleteStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -305,6 +319,14 @@ public class OmsOrder implements Serializable {
this.totalAmount = totalAmount;
}
public BigDecimal getPayAmount() {
return payAmount;
}
public void setPayAmount(BigDecimal payAmount) {
this.payAmount = payAmount;
}
public BigDecimal getFreightAmount() {
return freightAmount;
}
@@ -537,6 +559,14 @@ public class OmsOrder implements Serializable {
this.confirmStatus = confirmStatus;
}
public Integer getDeleteStatus() {
return deleteStatus;
}
public void setDeleteStatus(Integer deleteStatus) {
this.deleteStatus = deleteStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -550,6 +580,7 @@ public class OmsOrder implements Serializable {
sb.append(", createTime=").append(createTime);
sb.append(", memberUsername=").append(memberUsername);
sb.append(", totalAmount=").append(totalAmount);
sb.append(", payAmount=").append(payAmount);
sb.append(", freightAmount=").append(freightAmount);
sb.append(", promotionAmount=").append(promotionAmount);
sb.append(", integrationAmount=").append(integrationAmount);
@@ -579,6 +610,7 @@ public class OmsOrder implements Serializable {
sb.append(", receiverDetailAddress=").append(receiverDetailAddress);
sb.append(", note=").append(note);
sb.append(", confirmStatus=").append(confirmStatus);
sb.append(", deleteStatus=").append(deleteStatus);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

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

@@ -546,6 +546,66 @@ public class OmsOrderExample {
return (Criteria) this;
}
public Criteria andPayAmountIsNull() {
addCriterion("pay_amount is null");
return (Criteria) this;
}
public Criteria andPayAmountIsNotNull() {
addCriterion("pay_amount is not null");
return (Criteria) this;
}
public Criteria andPayAmountEqualTo(BigDecimal value) {
addCriterion("pay_amount =", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountNotEqualTo(BigDecimal value) {
addCriterion("pay_amount <>", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountGreaterThan(BigDecimal value) {
addCriterion("pay_amount >", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("pay_amount >=", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountLessThan(BigDecimal value) {
addCriterion("pay_amount <", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("pay_amount <=", value, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountIn(List<BigDecimal> values) {
addCriterion("pay_amount in", values, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountNotIn(List<BigDecimal> values) {
addCriterion("pay_amount not in", values, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("pay_amount between", value1, value2, "payAmount");
return (Criteria) this;
}
public Criteria andPayAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("pay_amount not between", value1, value2, "payAmount");
return (Criteria) this;
}
public Criteria andFreightAmountIsNull() {
addCriterion("freight_amount is null");
return (Criteria) this;
@@ -2435,6 +2495,66 @@ public class OmsOrderExample {
addCriterion("confirm_status not between", value1, value2, "confirmStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusIsNull() {
addCriterion("delete_status is null");
return (Criteria) this;
}
public Criteria andDeleteStatusIsNotNull() {
addCriterion("delete_status is not null");
return (Criteria) this;
}
public Criteria andDeleteStatusEqualTo(Integer value) {
addCriterion("delete_status =", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusNotEqualTo(Integer value) {
addCriterion("delete_status <>", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusGreaterThan(Integer value) {
addCriterion("delete_status >", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("delete_status >=", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusLessThan(Integer value) {
addCriterion("delete_status <", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusLessThanOrEqualTo(Integer value) {
addCriterion("delete_status <=", value, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusIn(List<Integer> values) {
addCriterion("delete_status in", values, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusNotIn(List<Integer> values) {
addCriterion("delete_status not in", values, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusBetween(Integer value1, Integer value2) {
addCriterion("delete_status between", value1, value2, "deleteStatus");
return (Criteria) this;
}
public Criteria andDeleteStatusNotBetween(Integer value1, Integer value2) {
addCriterion("delete_status not between", value1, value2, "deleteStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

2
mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java → mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java
View File

@@ -2,7 +2,7 @@ package com.macro.mall.model;
import java.io.Serializable;
public class UmsIntergrationConsumeSetting implements Serializable {
public class UmsIntegrationConsumeSetting implements Serializable {
private Long id;
/**

4
mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSettingExample.java → mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java
View File

@@ -3,14 +3,14 @@ package com.macro.mall.model;
import java.util.ArrayList;
import java.util.List;
public class UmsIntergrationConsumeSettingExample {
public class UmsIntegrationConsumeSettingExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public UmsIntergrationConsumeSettingExample() {
public UmsIntegrationConsumeSettingExample() {
oredCriteria = new ArrayList<Criteria>();
}