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

- 添加 item 删除

Browse Source 
- 添加 item 更新
- 添加 错误定义
- 添加 order common
This commit is contained in:
sin
2019-03-23 12:14:49 +08:00
parent 4fd506895c
commit bcae55bc59
23 changed files with 681 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
order/order-service-impl/src/main/java/cn/iocoder/mall/order/OrderCommon.java Normal file
View File

@@ -0,0 +1,22 @@
package cn.iocoder.mall.order;
import cn.iocoder.mall.order.dataobject.OrderItemDO;
import java.util.List;
/**
* 订单常用
*
* @author Sin
* @time 2019-03-23 11:51
*/
public interface OrderCommon {
/**
* 计算订单金额
*
* @param items
* @return
*/
Integer calculatedAmount(List<OrderItemDO> items);
}

30
order/order-service-impl/src/main/java/cn/iocoder/mall/order/OrderCommonImpl.java Normal file
View File

@@ -0,0 +1,30 @@
package cn.iocoder.mall.order;
import cn.iocoder.mall.order.dataobject.OrderItemDO;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
/**
* 订单常用
*
* @author Sin
* @time 2019-03-23 11:53
*/
@Component
public class OrderCommonImpl implements OrderCommon {
@Override
public Integer calculatedAmount(List<OrderItemDO> items) {
if (CollectionUtils.isEmpty(items)) {
return 0;
}
AtomicInteger totalAmount = new AtomicInteger(0);
items.forEach(orderItemDO -> {
totalAmount.addAndGet(orderItemDO.getPrice() * orderItemDO.getQuantity());
});
return totalAmount.get();
}
}

20
order/order-service-impl/src/main/java/cn/iocoder/mall/order/convert/OrderConvert.java
View File

@@ -2,7 +2,8 @@ package cn.iocoder.mall.order.convert;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.api.dto.OrderCreateItemDTO;
import cn.iocoder.mall.order.api.dto.OrderReceiverInformationDTO;
import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderLogisticsDTO;
import cn.iocoder.mall.order.dataobject.OrderDO;
import cn.iocoder.mall.order.dataobject.OrderItemDO;
import cn.iocoder.mall.order.dataobject.OrderLogisticsDO;
@@ -24,7 +25,7 @@ public interface OrderConvert {
OrderConvert INSTANCE = Mappers.getMapper(OrderConvert.class);
/**
* 转换 OrderDO - OrderCreateDTO
* 转换 OrderLogisticsDO - OrderCreateDTO
*
* @param orderCreateDTO
* @return
@@ -42,11 +43,20 @@ public interface OrderConvert {
List<OrderItemDO> convert(List<OrderCreateItemDTO> orderCreateItemDTOList);
/**
* 转换 OrderDO - orderReceiverInformationDTO
* 转换 OrderLogisticsDO - orderReceiverInformationDTO
*
* @param orderReceiverInformationDTO
* @param orderLogisticsDTO
* @return
*/
@Mappings({})
OrderDO convert(OrderReceiverInformationDTO orderReceiverInformationDTO);
OrderLogisticsDO convert(OrderLogisticsDTO orderLogisticsDTO);
/**
* 转换 OrderItemDO - orderReceiverInformationDTO
*
* @param orderItemUpdateDTO
* @return
*/
@Mappings({})
OrderItemDO convert(OrderItemUpdateDTO orderItemUpdateDTO);
}

33
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dao/OrderItemMapper.java
View File

@@ -1,8 +1,12 @@
package cn.iocoder.mall.order.dao;
import cn.iocoder.mall.order.dataobject.OrderItemDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 订单 item mapper
*
@@ -18,4 +22,33 @@ public interface OrderItemMapper {
* @param orderItemDO
*/
void insert(OrderItemDO orderItemDO);
/**
* 更新 - 根据Id
*
* @param orderItemDO
*/
void updateById(OrderItemDO orderItemDO);
/**
* 更新 - 根据Ids
*
* @param ids
* @param orderItemDO
*/
void updateByIds(
@Param("ids") List<Integer> ids,
OrderItemDO orderItemDO
);
/**
* 查询 - 根据 orderId 下的 item
*
* @param orderId
* @return
*/
List<OrderItemDO> selectByOrderIdAndDeleted(
@Param("orderId") Integer orderId,
@Param("deleted") @NotNull Integer deleted
);
}

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

@@ -18,4 +18,11 @@ public interface OrderLogisticsMapper {
* @param orderLogisticsDO
*/
void insert(OrderLogisticsDO orderLogisticsDO);
/**
* 更新 - 根据id
*
* @param orderLogisticsDO
*/
void updateById(OrderLogisticsDO orderLogisticsDO);
}

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

@@ -27,7 +27,7 @@ public class OrderDO extends DeletableDO {
/**
* 交易金额
*/
private Integer price;
private Integer money;
///
/// 时间信息
@@ -82,7 +82,7 @@ public class OrderDO extends DeletableDO {
"id=" + id +
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' +
", price=" + price +
", price=" + money +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
@@ -120,12 +120,12 @@ public class OrderDO extends DeletableDO {
return this;
}
public Integer getPrice() {
return price;
public Integer getMoney() {
return money;
}
public OrderDO setPrice(Integer price) {
this.price = price;
public OrderDO setMoney(Integer money) {
this.money = money;
return this;
}

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

@@ -27,7 +27,7 @@ public class OrderItemDO extends DeletableDO {
/**
* 商品编号
*/
private String skuId;
private Integer skuId;
/**
* 数量
*/
@@ -125,11 +125,11 @@ public class OrderItemDO extends DeletableDO {
return this;
}
public String getSkuId() {
public Integer getSkuId() {
return skuId;
}
public OrderItemDO setSkuId(String skuId) {
public OrderItemDO setSkuId(Integer skuId) {
this.skuId = skuId;
return this;
}

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

@@ -1,14 +1,15 @@
package cn.iocoder.mall.order.service;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.constant.DeletedStatusEnum;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.OrderCommon;
import cn.iocoder.mall.order.api.OrderService;
import cn.iocoder.mall.order.api.bo.OrderBO;
import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum;
import cn.iocoder.mall.order.api.constant.OrderHasReturnExchangeEnum;
import cn.iocoder.mall.order.api.constant.OrderStatusEnum;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.api.dto.OrderCreateItemDTO;
import cn.iocoder.mall.order.api.dto.OrderReceiverInformationDTO;
import cn.iocoder.mall.order.api.dto.OrderUpdateDTO;
import cn.iocoder.mall.order.api.dto.*;
import cn.iocoder.mall.order.convert.OrderConvert;
import cn.iocoder.mall.order.dao.OrderItemMapper;
import cn.iocoder.mall.order.dao.OrderLogisticsMapper;
@@ -19,12 +20,13 @@ import cn.iocoder.mall.order.dataobject.OrderLogisticsDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
* 订单 service impl
@@ -42,10 +44,12 @@ public class OrderServiceImpl implements OrderService {
private OrderItemMapper orderItemMapper;
@Autowired
private OrderLogisticsMapper orderLogisticsMapper;
@Autowired
private OrderCommon orderCommon;
@Override
@Transactional
public OrderBO createOrder(OrderCreateDTO orderCreateDTO) {
public CommonResult<OrderBO> createOrder(OrderCreateDTO orderCreateDTO) {
List<OrderCreateItemDTO> orderItemDTOList = orderCreateDTO.getOrderItems();
OrderLogisticsDO orderLogisticsDO = OrderConvert.INSTANCE.convert(orderCreateDTO);
List<OrderItemDO> orderItemDOList = OrderConvert.INSTANCE.convert(orderItemDTOList);
@@ -61,10 +65,7 @@ public class OrderServiceImpl implements OrderService {
OrderDO orderDO = new OrderDO();
orderDO.setOrderLogisticsId(orderLogisticsDO.getId());
orderDO.setOrderNo(UUID.randomUUID().toString().replace("-", ""));
orderDO.setPrice(-1); // 先设置一个默认值，金额在下面计算
orderDO.setCreateTime(new Date());
orderDO.setUpdateTime(null);
orderDO.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
orderDO.setMoney(-1); // 先设置一个默认值，金额在下面计算
orderDO.setClosingTime(null);
orderDO.setDeliveryTime(null);
@@ -72,14 +73,15 @@ public class OrderServiceImpl implements OrderService {
orderDO.setStatus(OrderStatusEnum.WAIT_SHIPMENT.getValue());
orderDO.setHasReturnExchange(OrderHasReturnExchangeEnum.NO.getValue());
orderDO.setRemark(Optional.ofNullable(orderCreateDTO.getRemark()).orElse(""));
orderDO.setCreateTime(new Date());
orderDO.setUpdateTime(null);
orderDO.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
orderMapper.insert(orderDO);
// order item
AtomicInteger totalPrice = new AtomicInteger();
orderItemDOList.forEach(orderItemDO -> {
int goodsPrice = 1000; // 商品单价
int price = orderItemDO.getQuantity() * goodsPrice;
totalPrice.addAndGet(price);
orderItemDO
.setOrderId(orderDO.getId())
.setOrderNo(orderDO.getOrderNo())
@@ -90,61 +92,102 @@ public class OrderServiceImpl implements OrderService {
.setClosingTime(null)
.setHasReturnExchange(OrderStatusEnum.WAITING_PAYMENT.getValue())
.setStatus(OrderStatusEnum.WAITING_PAYMENT.getValue())
.setDeleted(DeleteStatusEnum.DELETE_NO.getValue())
.setDeleted(DeletedStatusEnum.DELETED_NO.getValue())
.setCreateTime(new Date())
.setUpdateTime(new Date());
.setUpdateTime(null);
orderItemMapper.insert(orderItemDO);
});
// 更新订单金额
Integer totalAmount = orderCommon.calculatedAmount(orderItemDOList);
orderMapper.updateById(
new OrderDO()
.setId(orderDO.getId())
.setPrice(totalPrice.get())
.setMoney(totalAmount)
);
// TODO: 2019-03-17 Sin 需要发送 创建成果 MQ 消息
return new OrderBO()
.setId(orderDO.getId())
.setOrderNo(orderDO.getOrderNo())
.setPrice(orderDO.getPrice());
}
@Override
public void updateOrder(OrderUpdateDTO orderUpdateDTO) {
}
@Override
public void updateOrderReceiverInformation(OrderReceiverInformationDTO orderReceiverInfoDTO) {
// TODO: 2019-03-17 需要做校验 手机号
OrderDO orderDO = OrderConvert.INSTANCE.convert(orderReceiverInfoDTO);
orderMapper.updateById(orderDO);
}
@Override
public void deleteOrder(Integer id) {
// 删除订单操作，一般用于 用户端删除，是否存在检查可以过掉
orderMapper.updateById((OrderDO) new OrderDO()
.setId(id)
.setDeleted(DeleteStatusEnum.DELETE_YES.getValue())
return CommonResult.success(
new OrderBO()
.setId(orderDO.getId())
.setOrderNo(orderDO.getOrderNo())
.setMoney(orderDO.getMoney())
);
}
@Override
public void listenerPayment() {
public CommonResult updateOrderItem(OrderItemUpdateDTO orderUpdateDTO) {
OrderItemDO orderItemDO = OrderConvert.INSTANCE.convert(orderUpdateDTO);
orderItemMapper.updateById(orderItemDO);
return CommonResult.success(null);
}
@Override
public void listenerConfirmGoods() {
public CommonResult deleteOrderItem(OrderItemDeletedDTO orderItemDeletedDTO) {
Integer orderId = orderItemDeletedDTO.getOrderId();
List<Integer> orderItemIds = orderItemDeletedDTO.getOrderItemIds();
// 获取当前有效的订单 item
List<OrderItemDO> orderItemDOList = orderItemMapper
.selectByOrderIdAndDeleted(orderId, DeletedStatusEnum.DELETED_NO.getValue());
List<OrderItemDO> effectiveOrderItems = orderItemDOList.stream()
.filter(orderItemDO -> !orderItemIds.contains(orderItemDO.getId()))
.collect(Collectors.toList());
// 检查订单 item，必须要有一个 item
if (CollectionUtils.isEmpty(effectiveOrderItems)) {
return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_ITEM_ONLY_ONE.getCode());
}
// 更新订单 item
orderItemMapper.updateByIds(
orderItemIds,
(OrderItemDO) new OrderItemDO()
.setDeleted(DeletedStatusEnum.DELETED_YES.getValue())
);
// 更新订单 amount
Integer totalAmount = orderCommon.calculatedAmount(effectiveOrderItems);
orderMapper.updateById(
new OrderDO()
.setId(orderId)
.setMoney(totalAmount)
);
return CommonResult.success(null);
}
@Override
public void listenerExchangeGoods() {
public CommonResult updateLogistics(OrderLogisticsDTO orderLogisticsDTO) {
OrderLogisticsDO orderLogisticsDO = OrderConvert.INSTANCE.convert(orderLogisticsDTO);
orderLogisticsMapper.updateById(orderLogisticsDO);
return CommonResult.success(null);
}
@Override
public CommonResult deleteOrder(Integer id) {
// 删除订单操作，一般用于 用户端删除，是否存在检查可以过掉
orderMapper.updateById((OrderDO) new OrderDO()
.setId(id)
.setDeleted(DeletedStatusEnum.DELETED_YES.getValue())
);
return CommonResult.success(null);
}
@Override
public CommonResult listenerPayment() {
return null;
}
@Override
public CommonResult listenerConfirmGoods() {
return null;
}
@Override
public CommonResult listenerExchangeGoods() {
return null;
}
}

104
order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml
View File

@@ -3,8 +3,9 @@
<mapper namespace="cn.iocoder.mall.order.dao.OrderItemMapper">
<sql id="FIELDS">
id, order_id, commodity_id, quantity, price,
status, deliveryTime
id, order_id, order_no, sku_id, quantity, price,
payment_time, delivery_time, receiver_time, closing_time,
has_return_exchange, status, create_time, update_time, deleted
</sql>
<!--
@@ -12,12 +13,101 @@
-->
<insert id="insert" parameterType="OrderItemDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO `order_item` (
order_id, commodity_id, quantity, price,
status, deliveryTime
order_id, order_no, sku_id, quantity, price,
payment_time, delivery_time, receiver_time, closing_time,
has_return_exchange, status, create_time, update_time, deleted
) VALUES (
#{orderId}, #{commodityId}, #{quantity}, #{price},
#{status}, #{deliveryTime}
#{orderId}, #{orderNo}, #{skuId}, #{quantity}, #{price},
#{paymentTime}, #{deliveryTime}, #{receiverTime}, #{closingTime},
#{hasReturnExchange}, #{status},
#{createTime}, #{updateTime}, #{deleted}
)
</insert>
</mapper>
<!--
更新 - 可更新的字段
-->
<sql id="updateFieldSql" >
<set>
<if test="orderId != null">
, order_id = #{orderId}
</if>
<if test="orderNo != null">
, order_no = #{orderNo}
</if>
<if test="skuId != null">
, sku_id = #{skuId}
</if>
<if test="quantity != null">
, quantity = #{quantity}
</if>
<if test="price != null">
, price = #{price}
</if>
-- time
<if test="paymentTime != null">
, payment_time = #{paymentTime}
</if>
<if test="deliveryTime != null">
, delivery_time = #{deliveryTime}
</if>
<if test="receiverTime != null">
, receiver_time = #{receiverTime}
</if>
<if test="closingTime != null">
, closing_time = #{closingTime}
</if>
-- other
<if test="hasReturnExchange != null">
, has_return_exchange = #{hasReturnExchange}
</if>
<if test="status != null">
, status = #{status}
</if>
<if test="deleted != null">
, `deleted` = #{deleted}
</if>
<if test="createTime != null">
, create_time = #{createTime}
</if>
<if test="updateTime != null">
, update_time = #{updateTime}
</if>
</set>
</sql>
<!--
更新 - 根据 id 更新
-->
<update id="updateById" parameterType="OrderDO">
UPDATE `order_item`
<include refid="updateFieldSql" />
WHERE id = #{id}
</update>
<!--
更新 - 根据 ids 更新
-->
<update id="updateByIds">
UPDATE `order_item`
<include refid="updateFieldSql" />
WHERE id IN
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</update>
<!--
查询 - 根据 orderId 下的 item
-->
<select id="selectByOrderIdAndDeleted" resultType="cn.iocoder.mall.order.dataobject.OrderItemDO">
SELECT * FROM `order_item`
WHERE 1=1
<if test="deleted">
AND deleted = #{deleted}
</if>
<if test="orderId">
AND order_id = #{orderId}
</if>
</select>
</mapper>

35
order/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml
View File

@@ -11,11 +11,42 @@
-->
<insert id="insert" parameterType="OrderLogisticsDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO `order_logistics` (
area_no, `name`, mobile, address, logistics_no
area_no, `name`, mobile, address, logistics_no, create_time, update_time
) VALUES (
#{areaNo}, #{name}, #{mobile}, #{address},
#{logisticsNo}
#{logisticsNo}, #{createTime}, #{updateTime}
)
</insert>
<!--
可更新字段
-->
<sql id="updateFieldSql" >
<set>
<if test="areaNo != null">
, area_no = #{areaNo}
</if>
<if test="name != null">
, `name` = #{name}
</if>
<if test="mobile != null">
, mobile = #{mobile}
</if>
<if test="address != null">
, address = #{address}
</if>
<if test="logisticsNo != null">
, logistics_no = #{logisticsNo}
</if>
</set>
</sql>
<!--
更新 - 根据id
-->
<update id="updateById">
UPDATE `order_logistics`
<include refid="updateFieldSql" />
WHERE id = #{id}
</update>
</mapper>

32
order/order-service-impl/src/main/resources/mapper/OrderMapper.xml
View File

@@ -3,9 +3,9 @@
<mapper namespace="cn.iocoder.mall.order.dao.OrderMapper">
<sql id="FIELDS">
id, order_logistics_id, order_no, price, payment_time,
id, order_logistics_id, order_no, money, payment_time,
delivery_time, receiver_time, closing_time, has_return_exchange,
status, remark
status, remark, create_time, update_time, `delete`
</sql>
<!--
@@ -13,20 +13,22 @@
-->
<insert id="insert" parameterType="OrderDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO `order` (
order_logistics_id, order_no, price, payment_time,
order_logistics_id, order_no, money, payment_time,
delivery_time, receiver_time, closing_time,
has_return_exchange, status, remark
has_return_exchange, status, remark,
create_time, update_time, `deleted`
) VALUES (
#{orderLogisticsId}, ${orderNo}, #{price}, #{paymentTime},
#{orderLogisticsId}, #{orderNo}, #{money}, #{paymentTime},
#{deliveryTime}, #{receiverTime}, #{closingTime},
#{hasReturnExchange}, #{status}, #{remark}
#{hasReturnExchange}, #{status}, #{remark},
#{createTime}, #{updateTime}, #{deleted}
)
</insert>
<!--
更新 - 可更新的字段
-->
<sql id="updateSql" >
<sql id="updateFieldSql" >
<set>
<if test="orderLogisticsId != null">
, order_logistics_id = #{orderLogisticsId}
@@ -34,8 +36,8 @@
<if test="orderNo != null">
, order_no = #{orderNo}
</if>
<if test="price != null">
, price = #{price}
<if test="money != null">
, money = #{money}
</if>
-- time
<if test="paymentTime != null">
@@ -57,8 +59,11 @@
<if test="status != null">
, status = #{status}
</if>
<if test="delete != null">
, `delete` = #{delete}
<if test="remark != null">
, remark = #{remark}
</if>
<if test="deleted != null">
, `deleted` = #{deleted}
</if>
<if test="createTime != null">
, create_time = #{createTime}
@@ -66,9 +71,6 @@
<if test="updateTime != null">
, update_time = #{updateTime}
</if>
<if test="remark != null">
, remark = #{remark}
</if>
</set>
</sql>
@@ -77,7 +79,7 @@
-->
<update id="updateById" parameterType="OrderDO">
UPDATE `order`
<include refid="updateSql" />
<include refid="updateFieldSql" />
WHERE id = #{id}
</update>
</mapper>

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

@@ -22,7 +22,7 @@ import java.util.Arrays;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = OrderApplicationTest.class)
@Transactional
//@Transactional
public class OrderServiceImplTest {
@Autowired
@@ -34,12 +34,13 @@ public class OrderServiceImplTest {
public void createOrderTest() {
OrderCreateItemDTO orderCreateItemDTO
= new OrderCreateItemDTO()
.setSkuId("CID_001")
.setSkuId(1)
.setQuantity(1);
orderService.createOrder(
new OrderCreateDTO()
.setRemark("")
.setName("张三")
.setMobile("13301926050")
.setAddress("深圳市福田区")
.setAreaNo("1000100")