oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 添加 DeletableDO

Browse Source 
- 修改 DO extends
This commit is contained in:
sin
2019-03-22 22:22:33 +08:00
parent f4c7f65cb8
commit cc223fa2b3
41 changed files with 176 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java
View File

@@ -17,22 +17,22 @@ public class OrderCreateDTO implements Serializable {
* 收件区域编号
*/
@NotNull
private String receiverAreaNo;
private String areaNo;
/**
* 收件人名称
*/
@NotNull
private String receiverName;
private String name;
/**
* 收件手机号
*/
@NotNull
private String receiverMobile;
private String mobile;
/**
* 收件详细地址
*/
@NotNull
private String receiverAddress;
private String address;
/**
* 备注
*/
@@ -48,48 +48,48 @@ public class OrderCreateDTO implements Serializable {
@Override
public String toString() {
return "OrderCreateDTO{" +
"receiverAreaNo='" + receiverAreaNo + '\'' +
", receiverName='" + receiverName + '\'' +
", receiverMobile='" + receiverMobile + '\'' +
", receiverAddress='" + receiverAddress + '\'' +
"areaNo='" + areaNo + '\'' +
", name='" + name + '\'' +
", mobile='" + mobile + '\'' +
", address='" + address + '\'' +
", remark='" + remark + '\'' +
", orderItems=" + orderItems +
'}';
}
public String getReceiverAreaNo() {
return receiverAreaNo;
public String getAreaNo() {
return areaNo;
}
public OrderCreateDTO setReceiverAreaNo(String receiverAreaNo) {
this.receiverAreaNo = receiverAreaNo;
public OrderCreateDTO setAreaNo(String areaNo) {
this.areaNo = areaNo;
return this;
}
public String getReceiverName() {
return receiverName;
public String getName() {
return name;
}
public OrderCreateDTO setReceiverName(String receiverName) {
this.receiverName = receiverName;
public OrderCreateDTO setName(String name) {
this.name = name;
return this;
}
public String getReceiverMobile() {
return receiverMobile;
public String getMobile() {
return mobile;
}
public OrderCreateDTO setReceiverMobile(String receiverMobile) {
this.receiverMobile = receiverMobile;
public OrderCreateDTO setMobile(String mobile) {
this.mobile = mobile;
return this;
}
public String getReceiverAddress() {
return receiverAddress;
public String getAddress() {
return address;
}
public OrderCreateDTO setReceiverAddress(String receiverAddress) {
this.receiverAddress = receiverAddress;
public OrderCreateDTO setAddress(String address) {
this.address = address;
return this;
}

12
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java
View File

@@ -13,7 +13,7 @@ public class OrderCreateItemDTO {
* 商品编号
*/
@NotNull
private String commodityId;
private String skuId;
/**
* 数量
*/
@@ -24,17 +24,17 @@ public class OrderCreateItemDTO {
@Override
public String toString() {
return "OrderCreateItemDTO{" +
"commodityId='" + commodityId + '\'' +
"skuId='" + skuId + '\'' +
", quantity=" + quantity +
'}';
}
public String getCommodityId() {
return commodityId;
public String getSkuId() {
return skuId;
}
public OrderCreateItemDTO setCommodityId(String commodityId) {
this.commodityId = commodityId;
public OrderCreateItemDTO setSkuId(String skuId) {
this.skuId = skuId;
return this;
}

1
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dao/OrderLogisticsMapper.java
View File

@@ -1,6 +1,5 @@
package cn.iocoder.mall.order.dao;
import cn.iocoder.mall.order.dataobject.OrderDO;
import cn.iocoder.mall.order.dataobject.OrderLogisticsDO;
import org.springframework.stereotype.Repository;

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
@@ -10,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-16 13:49
*/
public class OrderDO extends BaseDO {
public class OrderDO extends DeletableDO {
/**
* id

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderExchangeDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
@@ -10,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderExchangeDO extends BaseDO {
public class OrderExchangeDO extends DeletableDO {
/**
* id

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderItemDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
@@ -10,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-16 14:03
*/
public class OrderItemDO extends BaseDO {
public class OrderItemDO extends DeletableDO {
/**
* 编号

1
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDO.java
View File

@@ -1,6 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* 订单物流信息

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDetailDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
@@ -12,7 +12,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 20:48
*/
public class OrderLogisticsDetailDO extends BaseDO {
public class OrderLogisticsDetailDO extends DeletableDO {
/**
* id

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderReturnDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
@@ -10,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderReturnDO extends BaseDO {
public class OrderReturnDO extends DeletableDO {
/**
* 编号自动增长

9
order/order-service-impl/src/main/java/cn/iocoder/mall/order/service/OrderServiceImpl.java
View File

@@ -51,7 +51,10 @@ public class OrderServiceImpl implements OrderService {
List<OrderItemDO> orderItemDOList = OrderConvert.INSTANCE.convert(orderItemDTOList);
// 物流信息
orderLogisticsDO.setLogisticsNo("");
orderLogisticsDO
.setLogisticsNo("")
.setCreateTime(new Date())
.setUpdateTime(null);
orderLogisticsMapper.insert(orderLogisticsDO);
// order
@@ -87,9 +90,9 @@ public class OrderServiceImpl implements OrderService {
.setClosingTime(null)
.setHasReturnExchange(OrderStatusEnum.WAITING_PAYMENT.getValue())
.setStatus(OrderStatusEnum.WAITING_PAYMENT.getValue())
.setDeleted(DeleteStatusEnum.DELETE_NO.getValue())
.setCreateTime(new Date())
.setUpdateTime(new Date())
.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
.setUpdateTime(new Date());
orderItemMapper.insert(orderItemDO);
});

22
order/order-service-impl/src/test/java/cn/iocoder/mall/order/service/OrderServiceImplTest.java
View File

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
@@ -21,7 +22,7 @@ import java.util.Arrays;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = OrderApplicationTest.class)
//@Transactional
@Transactional
public class OrderServiceImplTest {
@Autowired
@@ -31,24 +32,17 @@ public class OrderServiceImplTest {
@Test
public void createOrderTest() {
// Properties properties = System.getProperties();
// String url = properties.getProperty("spring.datasource.url");
// System.err.println(url);
String url = environment.getProperty("spring.datasource.url");
System.err.println(url);
OrderCreateItemDTO orderCreateItemDTO
= new OrderCreateItemDTO()
.setCommodityId("CID_001")
.setSkuId("CID_001")
.setQuantity(1);
orderService.createOrder(new OrderCreateDTO()
orderService.createOrder(
new OrderCreateDTO()
.setRemark("")
.setReceiverMobile("13301926050")
.setReceiverAddress("深圳市福田区")
.setReceiverAreaNo("1000100")
.setMobile("13301926050")
.setAddress("深圳市福田区")
.setAreaNo("1000100")
.setOrderItems(Arrays.asList(orderCreateItemDTO)));
}
}