合并代码

This commit is contained in:
岳鹏磊
2019-05-31 18:38:02 +08:00
parent d008e92baa
commit 7f092ce6c8
155 changed files with 9832 additions and 13 deletions

View File

@@ -0,0 +1,6 @@
swagger:
enable: true
title: 订单子系统
description: 订单子系统
version: 1.0.0
base-package: cn.iocoder.mall.pay.application.controller

View File

@@ -0,0 +1,28 @@
spring:
application:
name: order-application
cloud:
sentinel:
transport:
port: 8719
dashboard: localhost:12088
metric:
charset: UTF-8
eager: false
# server
server:
port: 18088
servlet:
context-path: /order-api/
swagger:
enable: false
management:
endpoints:
web:
exposure:
include: health,info,env,metrics,prometheus
metrics:
enabled: true

View File

@@ -0,0 +1,270 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.bo.CalcOrderPriceBO;
import cn.iocoder.mall.order.api.bo.CalcOrderPriceBO.Item;
import cn.iocoder.mall.order.api.bo.CalcOrderPriceBO.ItemGroup;
import cn.iocoder.mall.order.api.bo.CalcSkuPriceBO;
import cn.iocoder.mall.order.application.vo.UsersCalcSkuPriceVO;
import cn.iocoder.mall.order.application.vo.UsersCartDetailVO;
import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO;
import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.Fee;
import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.Sku;
import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.Spu;
import cn.iocoder.mall.product.api.bo.ProductAttrAndValuePairBO;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2019-05-24T11:47:18+0800",
comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
)
public class CartConvertImpl implements CartConvert {
@Override
public UsersOrderConfirmCreateVO convert(CalcOrderPriceBO calcOrderPriceBO) {
if ( calcOrderPriceBO == null ) {
return null;
}
UsersOrderConfirmCreateVO usersOrderConfirmCreateVO = new UsersOrderConfirmCreateVO();
usersOrderConfirmCreateVO.setItemGroups( itemGroupListToItemGroupList( calcOrderPriceBO.getItemGroups() ) );
usersOrderConfirmCreateVO.setFee( feeToFee( calcOrderPriceBO.getFee() ) );
usersOrderConfirmCreateVO.setCouponCardDiscountTotal( calcOrderPriceBO.getCouponCardDiscountTotal() );
return usersOrderConfirmCreateVO;
}
@Override
public UsersCartDetailVO convert2(CalcOrderPriceBO calcOrderPriceBO) {
if ( calcOrderPriceBO == null ) {
return null;
}
UsersCartDetailVO usersCartDetailVO = new UsersCartDetailVO();
usersCartDetailVO.setItemGroups( itemGroupListToItemGroupList1( calcOrderPriceBO.getItemGroups() ) );
usersCartDetailVO.setFee( feeToFee1( calcOrderPriceBO.getFee() ) );
return usersCartDetailVO;
}
@Override
public UsersCalcSkuPriceVO convert2(CalcSkuPriceBO calcSkuPriceBO) {
if ( calcSkuPriceBO == null ) {
return null;
}
UsersCalcSkuPriceVO usersCalcSkuPriceVO = new UsersCalcSkuPriceVO();
usersCalcSkuPriceVO.setFullPrivilege( calcSkuPriceBO.getFullPrivilege() );
usersCalcSkuPriceVO.setTimeLimitedDiscount( calcSkuPriceBO.getTimeLimitedDiscount() );
usersCalcSkuPriceVO.setOriginalPrice( calcSkuPriceBO.getOriginalPrice() );
usersCalcSkuPriceVO.setBuyPrice( calcSkuPriceBO.getBuyPrice() );
return usersCalcSkuPriceVO;
}
protected Spu spuToSpu(cn.iocoder.mall.product.api.bo.ProductSkuDetailBO.Spu spu) {
if ( spu == null ) {
return null;
}
Spu spu1 = new Spu();
spu1.setId( spu.getId() );
spu1.setName( spu.getName() );
spu1.setCid( spu.getCid() );
List<String> list = spu.getPicUrls();
if ( list != null ) {
spu1.setPicUrls( new ArrayList<String>( list ) );
}
return spu1;
}
protected Sku itemToSku(Item item) {
if ( item == null ) {
return null;
}
Sku sku = new Sku();
sku.setId( item.getId() );
sku.setSpu( spuToSpu( item.getSpu() ) );
sku.setPicURL( item.getPicURL() );
List<ProductAttrAndValuePairBO> list = item.getAttrs();
if ( list != null ) {
sku.setAttrs( new ArrayList<ProductAttrAndValuePairBO>( list ) );
}
sku.setPrice( item.getPrice() );
sku.setQuantity( item.getQuantity() );
sku.setBuyQuantity( item.getBuyQuantity() );
sku.setOriginPrice( item.getOriginPrice() );
sku.setBuyPrice( item.getBuyPrice() );
sku.setPresentPrice( item.getPresentPrice() );
sku.setBuyTotal( item.getBuyTotal() );
sku.setDiscountTotal( item.getDiscountTotal() );
sku.setPresentTotal( item.getPresentTotal() );
return sku;
}
protected List<Sku> itemListToSkuList(List<Item> list) {
if ( list == null ) {
return null;
}
List<Sku> list1 = new ArrayList<Sku>( list.size() );
for ( Item item : list ) {
list1.add( itemToSku( item ) );
}
return list1;
}
protected cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup itemGroupToItemGroup(ItemGroup itemGroup) {
if ( itemGroup == null ) {
return null;
}
cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup itemGroup1 = new cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup();
itemGroup1.setActivity( itemGroup.getActivity() );
itemGroup1.setItems( itemListToSkuList( itemGroup.getItems() ) );
return itemGroup1;
}
protected List<cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup> itemGroupListToItemGroupList(List<ItemGroup> list) {
if ( list == null ) {
return null;
}
List<cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup> list1 = new ArrayList<cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO.ItemGroup>( list.size() );
for ( ItemGroup itemGroup : list ) {
list1.add( itemGroupToItemGroup( itemGroup ) );
}
return list1;
}
protected Fee feeToFee(cn.iocoder.mall.order.api.bo.CalcOrderPriceBO.Fee fee) {
if ( fee == null ) {
return null;
}
Fee fee1 = new Fee();
fee1.setBuyTotal( fee.getBuyTotal() );
fee1.setDiscountTotal( fee.getDiscountTotal() );
fee1.setPostageTotal( fee.getPostageTotal() );
fee1.setPresentTotal( fee.getPresentTotal() );
return fee1;
}
protected cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Spu spuToSpu1(cn.iocoder.mall.product.api.bo.ProductSkuDetailBO.Spu spu) {
if ( spu == null ) {
return null;
}
cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Spu spu1 = new cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Spu();
spu1.setId( spu.getId() );
spu1.setName( spu.getName() );
spu1.setCid( spu.getCid() );
List<String> list = spu.getPicUrls();
if ( list != null ) {
spu1.setPicUrls( new ArrayList<String>( list ) );
}
return spu1;
}
protected cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku itemToSku1(Item item) {
if ( item == null ) {
return null;
}
cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku sku = new cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku();
sku.setId( item.getId() );
sku.setSpu( spuToSpu1( item.getSpu() ) );
sku.setPicURL( item.getPicURL() );
List<ProductAttrAndValuePairBO> list = item.getAttrs();
if ( list != null ) {
sku.setAttrs( new ArrayList<ProductAttrAndValuePairBO>( list ) );
}
sku.setPrice( item.getPrice() );
sku.setQuantity( item.getQuantity() );
sku.setBuyQuantity( item.getBuyQuantity() );
sku.setSelected( item.getSelected() );
sku.setActivity( item.getActivity() );
sku.setOriginPrice( item.getOriginPrice() );
sku.setBuyPrice( item.getBuyPrice() );
sku.setPresentPrice( item.getPresentPrice() );
sku.setBuyTotal( item.getBuyTotal() );
sku.setDiscountTotal( item.getDiscountTotal() );
sku.setPresentTotal( item.getPresentTotal() );
return sku;
}
protected List<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku> itemListToSkuList1(List<Item> list) {
if ( list == null ) {
return null;
}
List<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku> list1 = new ArrayList<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Sku>( list.size() );
for ( Item item : list ) {
list1.add( itemToSku1( item ) );
}
return list1;
}
protected cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup itemGroupToItemGroup1(ItemGroup itemGroup) {
if ( itemGroup == null ) {
return null;
}
cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup itemGroup1 = new cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup();
itemGroup1.setActivity( itemGroup.getActivity() );
itemGroup1.setActivityDiscountTotal( itemGroup.getActivityDiscountTotal() );
itemGroup1.setItems( itemListToSkuList1( itemGroup.getItems() ) );
return itemGroup1;
}
protected List<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup> itemGroupListToItemGroupList1(List<ItemGroup> list) {
if ( list == null ) {
return null;
}
List<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup> list1 = new ArrayList<cn.iocoder.mall.order.application.vo.UsersCartDetailVO.ItemGroup>( list.size() );
for ( ItemGroup itemGroup : list ) {
list1.add( itemGroupToItemGroup1( itemGroup ) );
}
return list1;
}
protected cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Fee feeToFee1(cn.iocoder.mall.order.api.bo.CalcOrderPriceBO.Fee fee) {
if ( fee == null ) {
return null;
}
cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Fee fee1 = new cn.iocoder.mall.order.application.vo.UsersCartDetailVO.Fee();
fee1.setBuyTotal( fee.getBuyTotal() );
fee1.setDiscountTotal( fee.getDiscountTotal() );
fee1.setPostageTotal( fee.getPostageTotal() );
fee1.setPresentTotal( fee.getPresentTotal() );
return fee1;
}
}

View File

@@ -0,0 +1,149 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.bo.CartItemBO;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO.OrderItem;
import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
import cn.iocoder.mall.order.application.po.admin.OrderItemUpdatePO;
import cn.iocoder.mall.order.application.po.admin.OrderLogisticsPO;
import cn.iocoder.mall.order.application.po.admin.OrderPageQueryPO;
import cn.iocoder.mall.order.application.po.user.OrderCreatePO;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2019-05-24T11:47:18+0800",
comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
)
public class OrderConvertAPPImpl implements OrderConvertAPP {
@Override
public OrderQueryDTO convert(OrderPageQueryPO orderPageQueryVO) {
if ( orderPageQueryVO == null ) {
return null;
}
OrderQueryDTO orderQueryDTO = new OrderQueryDTO();
orderQueryDTO.setId( orderPageQueryVO.getId() );
orderQueryDTO.setOrderNo( orderPageQueryVO.getOrderNo() );
orderQueryDTO.setUserId( orderPageQueryVO.getUserId() );
orderQueryDTO.setStartPaymentTime( orderPageQueryVO.getStartPaymentTime() );
orderQueryDTO.setEndPaymentTime( orderPageQueryVO.getEndPaymentTime() );
orderQueryDTO.setStartCreateTime( orderPageQueryVO.getStartCreateTime() );
orderQueryDTO.setEndCreateTime( orderPageQueryVO.getEndCreateTime() );
orderQueryDTO.setDeleted( orderPageQueryVO.getDeleted() );
orderQueryDTO.setStatus( orderPageQueryVO.getStatus() );
orderQueryDTO.setPageNo( orderPageQueryVO.getPageNo() );
orderQueryDTO.setPageSize( orderPageQueryVO.getPageSize() );
return orderQueryDTO;
}
@Override
public OrderLogisticsUpdateDTO convert(OrderLogisticsPO orderLogisticsVO) {
if ( orderLogisticsVO == null ) {
return null;
}
OrderLogisticsUpdateDTO orderLogisticsUpdateDTO = new OrderLogisticsUpdateDTO();
orderLogisticsUpdateDTO.setId( orderLogisticsVO.getId() );
orderLogisticsUpdateDTO.setAreaNo( orderLogisticsVO.getAreaNo() );
orderLogisticsUpdateDTO.setName( orderLogisticsVO.getName() );
orderLogisticsUpdateDTO.setMobile( orderLogisticsVO.getMobile() );
orderLogisticsUpdateDTO.setAddress( orderLogisticsVO.getAddress() );
orderLogisticsUpdateDTO.setLogisticsNo( orderLogisticsVO.getLogisticsNo() );
return orderLogisticsUpdateDTO;
}
@Override
public OrderItemUpdateDTO convert(OrderItemUpdatePO orderItemUpdateVO) {
if ( orderItemUpdateVO == null ) {
return null;
}
OrderItemUpdateDTO orderItemUpdateDTO = new OrderItemUpdateDTO();
orderItemUpdateDTO.setId( orderItemUpdateVO.getId() );
orderItemUpdateDTO.setSkuId( orderItemUpdateVO.getSkuId() );
orderItemUpdateDTO.setQuantity( orderItemUpdateVO.getQuantity() );
orderItemUpdateDTO.setPrice( orderItemUpdateVO.getPrice() );
return orderItemUpdateDTO;
}
@Override
public OrderCreateDTO convert(OrderCreatePO orderCreatePO) {
if ( orderCreatePO == null ) {
return null;
}
OrderCreateDTO orderCreateDTO = new OrderCreateDTO();
orderCreateDTO.setUserAddressId( orderCreatePO.getUserAddressId() );
orderCreateDTO.setCouponCardId( orderCreatePO.getCouponCardId() );
orderCreateDTO.setRemark( orderCreatePO.getRemark() );
orderCreateDTO.setOrderItems( orderItemListToOrderItemList( orderCreatePO.getOrderItems() ) );
return orderCreateDTO;
}
@Override
public List<OrderItem> convert(List<CartItemBO> cartItems) {
if ( cartItems == null ) {
return null;
}
List<OrderItem> list = new ArrayList<OrderItem>( cartItems.size() );
for ( CartItemBO cartItemBO : cartItems ) {
list.add( cartItemBOToOrderItem( cartItemBO ) );
}
return list;
}
protected OrderItem orderItemToOrderItem(cn.iocoder.mall.order.application.po.user.OrderCreatePO.OrderItem orderItem) {
if ( orderItem == null ) {
return null;
}
OrderItem orderItem1 = new OrderItem();
orderItem1.setSkuId( orderItem.getSkuId() );
orderItem1.setQuantity( orderItem.getQuantity() );
return orderItem1;
}
protected List<OrderItem> orderItemListToOrderItemList(List<cn.iocoder.mall.order.application.po.user.OrderCreatePO.OrderItem> list) {
if ( list == null ) {
return null;
}
List<OrderItem> list1 = new ArrayList<OrderItem>( list.size() );
for ( cn.iocoder.mall.order.application.po.user.OrderCreatePO.OrderItem orderItem : list ) {
list1.add( orderItemToOrderItem( orderItem ) );
}
return list1;
}
protected OrderItem cartItemBOToOrderItem(CartItemBO cartItemBO) {
if ( cartItemBO == null ) {
return null;
}
OrderItem orderItem = new OrderItem();
orderItem.setSkuId( cartItemBO.getSkuId() );
orderItem.setQuantity( cartItemBO.getQuantity() );
return orderItem;
}
}

View File

@@ -0,0 +1,34 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderDeliveryDTO;
import cn.iocoder.mall.order.application.po.admin.OrderDeliverPO;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2019-05-24T11:47:18+0800",
comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
)
public class OrderDeliveryConvertImpl implements OrderDeliveryConvert {
@Override
public OrderDeliveryDTO convert(OrderDeliverPO orderDeliverPO) {
if ( orderDeliverPO == null ) {
return null;
}
OrderDeliveryDTO orderDeliveryDTO = new OrderDeliveryDTO();
orderDeliveryDTO.setOrderId( orderDeliverPO.getOrderId() );
orderDeliveryDTO.setLogistics( orderDeliverPO.getLogistics() );
orderDeliveryDTO.setLogisticsNo( orderDeliverPO.getLogisticsNo() );
List<Integer> list = orderDeliverPO.getOrderItemIds();
if ( list != null ) {
orderDeliveryDTO.setOrderItemIds( new ArrayList<Integer>( list ) );
}
return orderDeliveryDTO;
}
}

View File

@@ -0,0 +1,51 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO;
import cn.iocoder.mall.order.api.dto.OrderReturnQueryDTO;
import cn.iocoder.mall.order.application.po.admin.OrderReturnQueryPO;
import cn.iocoder.mall.order.application.po.user.OrderReturnApplyPO;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2019-05-24T11:47:18+0800",
comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
)
public class OrderReturnConvertImpl implements OrderReturnConvert {
@Override
public OrderReturnApplyDTO convert(OrderReturnApplyPO orderReturnApplyPO) {
if ( orderReturnApplyPO == null ) {
return null;
}
OrderReturnApplyDTO orderReturnApplyDTO = new OrderReturnApplyDTO();
orderReturnApplyDTO.setOrderId( orderReturnApplyPO.getOrderId() );
orderReturnApplyDTO.setReason( orderReturnApplyPO.getReason() );
orderReturnApplyDTO.setDescribe( orderReturnApplyPO.getDescribe() );
orderReturnApplyDTO.setReturnType( orderReturnApplyPO.getReturnType() );
return orderReturnApplyDTO;
}
@Override
public OrderReturnQueryDTO convert(OrderReturnQueryPO orderReturnQueryPO) {
if ( orderReturnQueryPO == null ) {
return null;
}
OrderReturnQueryDTO orderReturnQueryDTO = new OrderReturnQueryDTO();
orderReturnQueryDTO.setOrderId( orderReturnQueryPO.getOrderId() );
orderReturnQueryDTO.setOrderNo( orderReturnQueryPO.getOrderNo() );
orderReturnQueryDTO.setServiceNumber( orderReturnQueryPO.getServiceNumber() );
orderReturnQueryDTO.setStartCreateTime( orderReturnQueryPO.getStartCreateTime() );
orderReturnQueryDTO.setEndCreateTime( orderReturnQueryPO.getEndCreateTime() );
orderReturnQueryDTO.setStatus( orderReturnQueryPO.getStatus() );
orderReturnQueryDTO.setIndex( orderReturnQueryPO.getIndex() );
orderReturnQueryDTO.setPageSize( orderReturnQueryPO.getPageSize() );
return orderReturnQueryDTO;
}
}