提交 b42aeac1 authored 作者: YunaiV's avatar YunaiV

Merge remote-tracking branch 'origin/master'

import request from "../config/request";
export function getOrderPage(params) {
return request({
url: '/order-api/users/order/order_page',
method: 'get',
params: {
...params,
}
});
}
export function cancelOrder(id) {
return request({
url: '/product-api/users/spu/info',
method: 'get',
params: {
id,
}
});
}
export function createOrder(params) {
return request({
headers: {
'Content-Type': 'application/json',
},
url: '/order-api/users/order/create_order',
method: 'post',
data: {
...params,
},
});
}
...@@ -2,7 +2,7 @@ import request from "../config/request"; ...@@ -2,7 +2,7 @@ import request from "../config/request";
export function getProductCategoryList(pid) { export function getProductCategoryList(pid) {
return request({ return request({
url: 'product-api/users/category/list', url: '/product-api/users/category/list',
method: 'get', method: 'get',
params: { params: {
pid pid
...@@ -12,7 +12,7 @@ export function getProductCategoryList(pid) { ...@@ -12,7 +12,7 @@ export function getProductCategoryList(pid) {
export function getProductSpuPage(cid, pageNo, pageSize) { export function getProductSpuPage(cid, pageNo, pageSize) {
return request({ return request({
url: 'product-api/users/spu/page', url: '/product-api/users/spu/page',
method: 'get', method: 'get',
params: { params: {
cid, cid,
...@@ -24,10 +24,10 @@ export function getProductSpuPage(cid, pageNo, pageSize) { ...@@ -24,10 +24,10 @@ export function getProductSpuPage(cid, pageNo, pageSize) {
export function getProductSpuInfo(id) { export function getProductSpuInfo(id) {
return request({ return request({
url: 'product-api/users/spu/info', url: '/product-api/users/spu/info',
method: 'get', method: 'get',
params: { params: {
id, id,
} }
}); });
} }
\ No newline at end of file
...@@ -15,6 +15,9 @@ export function getProductRecommendList() { ...@@ -15,6 +15,9 @@ export function getProductRecommendList() {
return request({ return request({
url: '/promotion-api/users/product_recommend/list', url: '/promotion-api/users/product_recommend/list',
method: 'get', method: 'get',
params: {
id,
}
}); });
} }
...@@ -40,6 +43,7 @@ export function doAddCouponCard(templateId) { ...@@ -40,6 +43,7 @@ export function doAddCouponCard(templateId) {
}); });
} }
// Coupon Card // Coupon Card
export function getCouponPage(status, pageNo, pageSize) { export function getCouponPage(status, pageNo, pageSize) {
......
...@@ -74,7 +74,7 @@ export function ExchangeCoupon(code){ ...@@ -74,7 +74,7 @@ export function ExchangeCoupon(code){
export function getUserInfo() { export function getUserInfo() {
return request({ return request({
url: 'user-api/users/user/info', url: '/user-api/users/user/info',
method: 'get', method: 'get',
}); });
} }
......
<template> <template>
<div> <div>
<ul :class="'cap-goods-list__container cap-goods-list__container--'+data.classname+' cap-goods-list__container--'+data.ParameterDictionary.showtype+' '+(data.ParameterDictionary.type=='6'?'nowrap':'')" > <ul
<li v-if="productlist.length==0" style="width:100%;height:150px;border:0px;"> :class="'cap-goods-list__container cap-goods-list__container--'+data.classname+' cap-goods-list__container--'+data.ParameterDictionary.showtype+' '+(data.ParameterDictionary.type=='6'?'nowrap':'')">
<div style="width:100%;height:150px;"></div> <li v-if="productlist.length==0" style="width:100%;height:150px;border:0px;">
</li> <div style="width:100%;height:150px;"></div>
<li v-for="(item,index) in productlist" :key="index" :class="'cap-goods-list__wrapper '+(data.ParameterDictionary.type=='3'?(index%3==0?'cap-goods-list__wrapper--hybrid-big ':'cap-goods-list__wrapper--hybrid-small '):'')"> </li>
<router-link :class="'cap-goods-list__item cap-goods-list__item--'+data.classname+' '+data.ParameterDictionary.showtype+' '+data.aclass" :to="'/product/'+item.id"> <li v-for="(item,index) in productlist" :key="index"
<div class="cap-goods-list__photo"> :class="'cap-goods-list__wrapper '+(data.ParameterDictionary.type=='3'?(index%3==0?'cap-goods-list__wrapper--hybrid-big ':'cap-goods-list__wrapper--hybrid-small '):'')">
<img class="cap-goods-list__img lazy lazyload" v-lazy="item.imageURL+'?w='+((data.ParameterDictionary.type=='1'||data.ParameterDictionary.type=='3')?'750':'375')" /> <router-link
</div> :class="'cap-goods-list__item cap-goods-list__item--'+data.classname+' '+data.ParameterDictionary.showtype+' '+data.aclass"
<div :class="'cap-goods-list__info has-title has-price '+(data.ParameterDictionary.showtype == 'card'?'has-btn':'')"> :to="'/product/'+item.id">
<h3 class="title">{{item.title}}</h3> <div class="cap-goods-list__photo">
<p class="sale-info"> <img class="cap-goods-list__img lazy lazyload"
<span class="sale-price">¥ {{item.price}}</span> v-lazy="item.imageURL+'?w='+((data.ParameterDictionary.type=='1'||data.ParameterDictionary.type=='3')?'750':'375')"/>
</p> </div>
</div> <div
<div v-if="data.ParameterDictionary.showtype == 'card'" class="cap-goods-list__buy-btn-wrapper cap-goods-list__buy-btn-wrapper--4"> :class="'cap-goods-list__info has-title has-price '+(data.ParameterDictionary.showtype == 'card'?'has-btn':'')">
<button class="cap-goods-list__buy-btn-4 van-button van-button--default van-button--small">{{data.ParameterDictionary.buttonvalue}}</button> <h3 class="title">{{item.title}}</h3>
</div> <p class="sale-info">
</router-link> <span class="sale-price">¥ {{item.price}}</span>
</li> </p>
</div>
<div v-if="data.ParameterDictionary.showtype == 'card'"
class="cap-goods-list__buy-btn-wrapper cap-goods-list__buy-btn-wrapper--4">
<button
class="cap-goods-list__buy-btn-4 van-button van-button--default van-button--small">
{{data.ParameterDictionary.buttonvalue}}
</button>
</div>
</router-link>
</li>
</ul> </ul>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</template> </template>
<script> <script>
import {getProduct} from "../../api/page.js"; import {getProduct} from "../../api/page.js";
export default { export default {
name:'product', name: 'product',
data () { data() {
return { return {
productlist: [] productlist: []
} }
}, },
props:{ props: {
data:Object data: Object
}, },
created:function(){ created: function () {
var id=this.data.PageSectionId; var id = this.data.PageSectionId;
var data=this.data; var data = this.data;
var classname = "big"; var classname = "big";
var aclass = ""; var aclass = "";
switch (data.ParameterDictionary.type) { switch (data.ParameterDictionary.type) {
case "1": case "1":
aclass = "cap-goods-list__item--btn1 cap-goods-list__item--ratio-3-2 cap-goods-list__item--whitespace"; aclass = "cap-goods-list__item--btn1 cap-goods-list__item--ratio-3-2 cap-goods-list__item--whitespace";
break; break;
case "2": case "2":
classname = "small"; classname = "small";
aclass = "cap-goods-list__item--btn1 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn1 cap-goods-list__item--padding";
break; break;
case "3": case "3":
classname = "hybrid"; classname = "hybrid";
aclass = "cap-goods-list__item--big cap-goods-list__item--hybrid-big cap-goods-list__item--btn1 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--big cap-goods-list__item--hybrid-big cap-goods-list__item--btn1 cap-goods-list__item--padding";
break; break;
case "4": case "4":
classname = "list"; classname = "list";
aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding";
break; break;
case "5": case "5":
classname = "three"; classname = "three";
aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding";
break; break;
case "6": case "6":
classname = "three"; classname = "three";
break; break;
} }
data.classname=classname; data.classname = classname;
data.aclass=aclass; data.aclass = aclass;
getProduct(id).then(response => { getProduct(id).then(response => {
this.productlist=response; this.productlist = response;
}) })
} }
} }
</script> </script>
<style> <style>
......
...@@ -15,9 +15,13 @@ const serviceRouter = function(requestUrl) { ...@@ -15,9 +15,13 @@ const serviceRouter = function(requestUrl) {
prefix: '/user-api', prefix: '/user-api',
target: 'http://127.0.0.1:18082/user-api', target: 'http://127.0.0.1:18082/user-api',
}, },
'/product-api': {
prefix: '/product-api',
target: 'http://127.0.0.1:18081/product-api',
},
'/promotion-api': { '/promotion-api': {
prefix: '/promotion-api', prefix: '/promotion-api',
target: 'http://127.0.0.1:18085/promotion-api', target: 'http://127.0.0.1:18085//promotion-api',
}, },
}; };
...@@ -30,9 +34,13 @@ const serviceRouter = function(requestUrl) { ...@@ -30,9 +34,13 @@ const serviceRouter = function(requestUrl) {
prefix: '/user-api', prefix: '/user-api',
target: 'http://127.0.0.1:18082/user-api', target: 'http://127.0.0.1:18082/user-api',
}, },
'/product-api': {
prefix: '/product-api',
target: 'http://127.0.0.1:18081/product-api',
},
'/promotion-api': { '/promotion-api': {
prefix: '/promotion-api', prefix: '/promotion-api',
target: 'http://127.0.0.1:18085/promotion-api', target: 'http://127.0.0.1:18085//promotion-api',
}, },
}; };
...@@ -65,7 +73,9 @@ const serviceRouter = function(requestUrl) { ...@@ -65,7 +73,9 @@ const serviceRouter = function(requestUrl) {
const indexOf = requestUrl.indexOf("/", 1); const indexOf = requestUrl.indexOf("/", 1);
const _urlPrefix = requestUrl.substring(0, indexOf); const _urlPrefix = requestUrl.substring(0, indexOf);
if (!config[_urlPrefix]) { if (!config[_urlPrefix]) {
throw new Error(`服务路由,未找到可用服务! ${requestUrl}`); // throw new Error(`服务路由,未找到可用服务! ${requestUrl}`);
console.error(`服务路由,未找到可用服务! ${requestUrl}`)
return ''
} }
// if (!createServer[_urlPrefix]) { // if (!createServer[_urlPrefix]) {
// throw new Error("服务路由,未找到可用服务!"); // throw new Error("服务路由,未找到可用服务!");
......
...@@ -181,6 +181,13 @@ const routes = [ ...@@ -181,6 +181,13 @@ const routes = [
title: '确认订单' title: '确认订单'
} }
}, },
{
path: '/order/success',
component: () => import('../page/shipping/order-success'),
meta: {
title: '确认订单'
}
},
{ {
name: 'category', name: 'category',
component: () => import('../page/category/index'), component: () => import('../page/category/index'),
......
<template>
<div class="order-success">
<headerNav title="提交成功"/>
<sapn>TODO 支付成功</sapn>
<router-link :to="'/user/order'">
<van-button size="small" type="danger">订单列表</van-button>
</router-link>
</div>
</template>
<script>
import {createOrder} from '../../api/order';
export default {
data() {
return {
}
},
methods: {
},
activated() {
},
};
</script>
<style lang="less">
.order-success {
text-align: center;
}
</style>
<template> <template>
<div class="order"> <div class="order">
<headerNav title="确认订单"/> <headerNav title="确认订单"/>
<van-cell <van-cell
center center
:border="false" :border="false"
class="contact-card" class="contact-card"
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
</template> </template>
<template v-else> <template v-else>
<strong>张三 138****6520</strong> <strong>张三 138****6520</strong>
<div>广东省深圳市南山区科技园 </div> <div>广东省深圳市南山区科技园</div>
</template> </template>
</van-cell> </van-cell>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<div class="card" v-for="(product,i) in products" :key="i"> <div class="card" v-for="(product,i) in products" :key="i">
<product-card :product='product' /> <product-card :product='product'/>
</div> </div>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group> <van-cell-group>
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
</van-cell-group> </van-cell-group>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group class="total"> <van-cell-group class="total">
<van-cell title="优惠券" is-link value="抵扣¥5.00" /> <van-cell title="优惠券" is-link value="抵扣¥5.00"/>
</van-cell-group> </van-cell-group>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group class="total"> <van-cell-group class="total">
<van-cell title="商品总额" value="9.99" /> <van-cell title="商品总额" value="9.99"/>
<van-cell title="运费" value="+ 0.00" /> <van-cell title="运费" value="+ 0.00"/>
<van-cell title="折扣" value="- 5.00" /> <van-cell title="折扣" value="- 5.00"/>
<van-cell title="实付金额" value="4.99" style="font-weight: 700;" /> <van-cell title="实付金额" value="4.99" style="font-weight: 700;"/>
</van-cell-group> </van-cell-group>
<div style="height:50px;"></div> <div style="height:50px;"></div>
...@@ -55,130 +55,155 @@ ...@@ -55,130 +55,155 @@
</template> </template>
<script> <script>
export default {
data() { import {createOrder} from '../../api/order';
return {
type: "add1", export default {
products: [ data() {
{ return {
imageURL: type: "add1",
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg", products: [
title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g", {
desc: "0.670kg/件,肉肉聚汇520g", imageURL:
price: "59.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg",
quantity: 2 title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g",
}, desc: "0.670kg/件,肉肉聚汇520g",
{ price: "59.80",
imageURL: quantity: 2
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t22720/128/1410375403/319576/8dbd859f/5b5e69b3Nf4f0e9e7.jpg", },
title: "元朗 鸡蛋卷 饼干糕点 中秋礼盒 广东特产680g", {
desc: "1.320kg/件", imageURL:
price: "65.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t22720/128/1410375403/319576/8dbd859f/5b5e69b3Nf4f0e9e7.jpg",
quantity: 1, title: "元朗 鸡蛋卷 饼干糕点 中秋礼盒 广东特产680g",
gift: [ desc: "1.320kg/件",
{ price: "65.80",
title: "星巴克(Starbucks)星冰乐小熊吊饰星巴克(Starbucks)星冰乐小熊吊饰", quantity: 1,
quantity: 2 gift: [
}, {
{ title: "星巴克(Starbucks)星冰乐小熊吊饰星巴克(Starbucks)星冰乐小熊吊饰",
title: "星巴克(Starbucks)星冰乐小熊吊饰星巴克(Starbucks)星冰乐小熊吊饰", quantity: 2
quantity: 1 },
} {
] title: "星巴克(Starbucks)星冰乐小熊吊饰星巴克(Starbucks)星冰乐小熊吊饰",
}, quantity: 1
{ }
imageURL: ]
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg", },
title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g", {
desc: "0.670kg/件,肉肉聚汇520g", imageURL:
price: "59.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg",
quantity: 2 title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g",
}, desc: "0.670kg/件,肉肉聚汇520g",
] price: "59.80",
}; quantity: 2
}, },
methods: { ]
onSubmit() { };
this.$toast("点击按钮");
}, },
}, methods: {
activated(){ onSubmit() {
//根据key名获取传递回来的参数,data就是map this.$toast("点击按钮");
this.$on('selectAddress', function(data){ const { skuId, quantity } = this.$route.query;
const userAddressId = 1;
const remark = '';
const orderItems = [{
skuId,
quantity,
}];
createOrder({
orderItems,
userAddressId,
remark,
})
},
},
activated() {
//根据key名获取传递回来的参数,data就是map
this.$on('selectAddress', function (data) {
//赋值给首页的附近医院数据模型 //赋值给首页的附近医院数据模型
console.log(1); console.log(1);
}.bind(this)); }.bind(this));
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
.order { .order {
font-size: 14px; font-size: 14px;
background: #f7f7f7; background: #f7f7f7;
.contact-card::before {
content: ""; .contact-card::before {
left: 0; content: "";
right: 0; left: 0;
bottom: 0; right: 0;
height: 2px; bottom: 0;
position: absolute; height: 2px;
background: -webkit-repeating-linear-gradient( position: absolute;
135deg, background: -webkit-repeating-linear-gradient(
#ff6c6c 0, 135deg,
#ff6c6c 20%, #ff6c6c 0,
transparent 0, #ff6c6c 20%,
transparent 25%, transparent 0,
#3283fa 0, transparent 25%,
#3283fa 45%, #3283fa 0,
transparent 0, #3283fa 45%,
transparent 50% transparent 0,
); transparent 50%
background: repeating-linear-gradient( );
-45deg, background: repeating-linear-gradient(
#ff6c6c 0, -45deg,
#ff6c6c 20%, #ff6c6c 0,
transparent 0, #ff6c6c 20%,
transparent 25%, transparent 0,
#3283fa 0, transparent 25%,
#3283fa 45%, #3283fa 0,
transparent 0, #3283fa 45%,
transparent 50% transparent 0,
); transparent 50%
background-size: 80px; );
} background-size: 80px;
.total {
.van-cell__value {
color: red;
}
}
.van-submit-bar__bar {
border-top: 1px solid #f7f7f7;
}
.additional {
.van-cell {
padding: 0 15px;
font-size: 12px;
} }
.van-cell__title {
flex: 11; .total {
overflow: hidden; .van-cell__value {
text-overflow: ellipsis; color: red;
white-space: nowrap; }
} }
.van-tag {
line-height: 12px; .van-submit-bar__bar {
margin-right: 5px; border-top: 1px solid #f7f7f7;
} }
.price { .additional {
color: #e93b3d; .van-cell {
font-size: 10px; padding: 0 15px;
span { font-size: 12px;
font-size: 16px; }
.van-cell__title {
flex: 11;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.van-tag {
line-height: 12px;
margin-right: 5px;
}
.price {
color: #e93b3d;
font-size: 10px;
span {
font-size: 16px;
}
} }
} }
} }
}
</style> </style>
...@@ -109,29 +109,13 @@ ...@@ -109,29 +109,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
<!-- 打包 --> <!-- 打包 -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -33,4 +33,12 @@ public class MVCConfiguration implements WebMvcConfigurer { ...@@ -33,4 +33,12 @@ public class MVCConfiguration implements WebMvcConfigurer {
registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
} }
// TODO 芋艿,允许跨域
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedHeaders("*")
.allowedMethods("*")
.allowedOrigins("*");
}
} }
\ No newline at end of file
...@@ -8,10 +8,10 @@ import cn.iocoder.mall.order.api.bo.OrderRecipientBO; ...@@ -8,10 +8,10 @@ import cn.iocoder.mall.order.api.bo.OrderRecipientBO;
import cn.iocoder.mall.order.api.dto.*; import cn.iocoder.mall.order.api.dto.*;
import cn.iocoder.mall.order.application.convert.OrderConvertAPP; import cn.iocoder.mall.order.application.convert.OrderConvertAPP;
import cn.iocoder.mall.order.application.convert.OrderDeliveryConvert; import cn.iocoder.mall.order.application.convert.OrderDeliveryConvert;
import cn.iocoder.mall.order.application.po.OrderDeliverPO; import cn.iocoder.mall.order.application.po.admin.OrderDeliverPO;
import cn.iocoder.mall.order.application.po.OrderItemUpdatePO; import cn.iocoder.mall.order.application.po.admin.OrderItemUpdatePO;
import cn.iocoder.mall.order.application.po.OrderLogisticsPO; import cn.iocoder.mall.order.application.po.admin.OrderLogisticsPO;
import cn.iocoder.mall.order.application.po.OrderPageQueryPO; import cn.iocoder.mall.order.application.po.admin.OrderPageQueryPO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -37,7 +37,7 @@ public class AdminsOrderController { ...@@ -37,7 +37,7 @@ public class AdminsOrderController {
@GetMapping("page") @GetMapping("page")
@ApiOperation("订单列表") @ApiOperation("订单列表")
public CommonResult<OrderPageBO> getOrderPage(@Validated OrderPageQueryPO orderPageQueryVO) { public CommonResult<OrderPageBO> getOrderPage(@Validated OrderPageQueryPO orderPageQueryVO) {
OrderQueryDTO orderQueryDTO = OrderConvertAPP.INSTANCE.convertPageBO(orderPageQueryVO); OrderQueryDTO orderQueryDTO = OrderConvertAPP.INSTANCE.convert(orderPageQueryVO);
return orderService.getOrderPage(orderQueryDTO); return orderService.getOrderPage(orderQueryDTO);
} }
...@@ -86,14 +86,14 @@ public class AdminsOrderController { ...@@ -86,14 +86,14 @@ public class AdminsOrderController {
@PutMapping("order_item/update") @PutMapping("order_item/update")
@ApiOperation("更新-订单item") @ApiOperation("更新-订单item")
public CommonResult updateOrderItem(@RequestBody @Validated OrderItemUpdatePO orderItemUpdateVO) { public CommonResult updateOrderItem(@RequestBody @Validated OrderItemUpdatePO orderItemUpdateVO) {
OrderItemUpdateDTO dto = OrderConvertAPP.INSTANCE.convertPageBO(orderItemUpdateVO); OrderItemUpdateDTO dto = OrderConvertAPP.INSTANCE.convert(orderItemUpdateVO);
return orderService.updateOrderItem(dto); return orderService.updateOrderItem(dto);
} }
@PutMapping("logistics/update") @PutMapping("logistics/update")
@ApiOperation("更新-订单物流") @ApiOperation("更新-订单物流")
public CommonResult updateLogistics(@RequestBody @Validated OrderLogisticsPO orderLogisticsVO) { public CommonResult updateLogistics(@RequestBody @Validated OrderLogisticsPO orderLogisticsVO) {
OrderLogisticsUpdateDTO dto = OrderConvertAPP.INSTANCE.convertPageBO(orderLogisticsVO); OrderLogisticsUpdateDTO dto = OrderConvertAPP.INSTANCE.convert(orderLogisticsVO);
return orderService.updateLogistics(dto); return orderService.updateLogistics(dto);
} }
} }
package cn.iocoder.mall.order.application.controller.users; package cn.iocoder.mall.order.application.controller.users;
import org.springframework.web.bind.annotation.RequestMapping; import cn.iocoder.common.framework.vo.CommonResult;
import org.springframework.web.bind.annotation.RestController; import cn.iocoder.mall.order.api.OrderService;
import cn.iocoder.mall.order.api.bo.OrderCreateBO;
import cn.iocoder.mall.order.api.bo.OrderPageBO;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
import cn.iocoder.mall.order.api.dto.OrderUserPageDTO;
import cn.iocoder.mall.order.application.convert.OrderConvertAPP;
import cn.iocoder.mall.order.application.po.user.OrderCreatePO;
import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/** /**
* 订单API(users) * 订单API(users)
...@@ -12,4 +23,22 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -12,4 +23,22 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("users/order") @RequestMapping("users/order")
public class UsersOrderController { public class UsersOrderController {
@Autowired
private OrderService orderService;
@GetMapping("order_page")
public CommonResult<OrderPageBO> getOrderPage(@Validated OrderQueryDTO orderQueryDTO) {
Integer userId = UserSecurityContextHolder.getContext().getUserId();
orderQueryDTO.setUserId(userId);
return orderService.getOrderPage(orderQueryDTO);
}
@PostMapping("create_order")
public CommonResult<OrderCreateBO> createOrder(@RequestBody @Validated OrderCreatePO orderCreatePO) {
Integer userId = UserSecurityContextHolder.getContext().getUserId();
OrderCreateDTO orderCreateDTO = OrderConvertAPP.INSTANCE.convert(orderCreatePO);
orderCreateDTO.setUserId(1);
return orderService.createOrder(orderCreateDTO);
}
} }
package cn.iocoder.mall.order.application.convert; package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO; import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO; import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderQueryDTO; import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
import cn.iocoder.mall.order.application.po.OrderItemUpdatePO; import cn.iocoder.mall.order.application.po.admin.OrderItemUpdatePO;
import cn.iocoder.mall.order.application.po.OrderPageQueryPO; import cn.iocoder.mall.order.application.po.admin.OrderLogisticsPO;
import cn.iocoder.mall.order.application.po.OrderLogisticsPO; import cn.iocoder.mall.order.application.po.admin.OrderPageQueryPO;
import cn.iocoder.mall.order.application.po.user.OrderCreatePO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
...@@ -24,11 +26,14 @@ public interface OrderConvertAPP { ...@@ -24,11 +26,14 @@ public interface OrderConvertAPP {
OrderConvertAPP INSTANCE = Mappers.getMapper(OrderConvertAPP.class); OrderConvertAPP INSTANCE = Mappers.getMapper(OrderConvertAPP.class);
@Mappings({}) @Mappings({})
OrderQueryDTO convertPageBO(OrderPageQueryPO orderPageQueryVO); OrderQueryDTO convert(OrderPageQueryPO orderPageQueryVO);
@Mappings({}) @Mappings({})
OrderLogisticsUpdateDTO convertPageBO(OrderLogisticsPO orderLogisticsVO); OrderLogisticsUpdateDTO convert(OrderLogisticsPO orderLogisticsVO);
@Mappings({}) @Mappings({})
OrderItemUpdateDTO convertPageBO(OrderItemUpdatePO orderItemUpdateVO); OrderItemUpdateDTO convert(OrderItemUpdatePO orderItemUpdateVO);
@Mappings({})
OrderCreateDTO convert(OrderCreatePO orderCreatePO);
} }
package cn.iocoder.mall.order.application.convert; package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderDeliveryDTO; import cn.iocoder.mall.order.api.dto.OrderDeliveryDTO;
import cn.iocoder.mall.order.application.po.OrderDeliverPO; import cn.iocoder.mall.order.application.po.admin.OrderDeliverPO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
......
package cn.iocoder.mall.order.application.po; package cn.iocoder.mall.order.application.po.admin;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
package cn.iocoder.mall.order.application.po; package cn.iocoder.mall.order.application.po.admin;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
package cn.iocoder.mall.order.application.po; package cn.iocoder.mall.order.application.po.admin;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
package cn.iocoder.mall.order.application.po; package cn.iocoder.mall.order.application.po.admin;
import cn.iocoder.mall.order.api.bo.OrderBO; import cn.iocoder.mall.order.api.bo.OrderBO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
package cn.iocoder.mall.order.application.po; package cn.iocoder.mall.order.application.po.admin;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
package cn.iocoder.mall.order.application.po.user;
import cn.iocoder.mall.order.api.dto.OrderCreateItemDTO;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.List;
/**
* 订单创建
*
* @author Sin
* @time 2019-03-16 14:42
*/
@Data
@Accessors(chain = true)
public class OrderCreatePO implements Serializable {
/**
* 收件手机号
*/
@NotNull(message = "用户地址id不能为空!")
private Integer userAddressId;
/**
* 备注
*/
private String remark;
///
/// order item
@NotNull()
@Size(max = 1000, min = 1, message = "用户订单中没有商品!")
private List<OrderCreateItemDTO> orderItems;
}
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
<artifactId>order-service-api</artifactId> <artifactId>order-service-api</artifactId>
<properties>
<org.projectlombok.version>1.16.14</org.projectlombok.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
...@@ -26,10 +22,17 @@ ...@@ -26,10 +22,17 @@
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -44,11 +44,10 @@ public interface OrderService { ...@@ -44,11 +44,10 @@ public interface OrderService {
/** /**
* 订单 - 创建 * 订单 - 创建
* *
* @param userId
* @param orderCreateDTO * @param orderCreateDTO
* @return * @return
*/ */
CommonResult<OrderCreateBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO); CommonResult<OrderCreateBO> createOrder(OrderCreateDTO orderCreateDTO);
/** /**
* 订单item - 更新 * 订单item - 更新
......
package cn.iocoder.mall.order.api.bo;
import java.io.Serializable;
/**
* 订单支付信息返回
*
* @author Sin
* @time 2019-04-08 19:39
*/
public class OrderPayBO implements Serializable {
}
...@@ -17,9 +17,16 @@ public enum OrderErrorCodeEnum { ...@@ -17,9 +17,16 @@ public enum OrderErrorCodeEnum {
ORDER_PAY_AMOUNT_NOT_NEGATIVE(1008000003, "支付金额不能为负数!"), ORDER_PAY_AMOUNT_NOT_NEGATIVE(1008000003, "支付金额不能为负数!"),
ORDER_STATUS_NOT_CANCEL(1008000004, "订单状态不能取消!"), ORDER_STATUS_NOT_CANCEL(1008000004, "订单状态不能取消!"),
ORDER_DELIVERY_INCORRECT_DATA(1008000005, "订单发货数据不正确!"), ORDER_DELIVERY_INCORRECT_DATA(1008000005, "订单发货数据不正确!"),
ORDER_INSUFFICIENT_INVENTORY(1008000006, "库存不足!"),
ORDER_GOODS_AMOUNT_INCORRECT(1008000007, "商品金额非法!"),
ORDER_GET_GOODS_INFO_INCORRECT(1008000008, "获取额商品信息不正确!"),
ORDER_GET_USER_ADDRESS_FAIL(1008000009, "获取用户地址失败!"),
ORDER_GET_PAY_FAIL(1008000009, "调用pay失败!"),
// order item // order item
ORDER_ITEM_ONLY_ONE(1008000004, "订单Item只有一个!"), ORDER_ITEM_ONLY_ONE(1008000004, "订单Item只有一个!"),
; ;
private final int code; private final int code;
......
...@@ -6,7 +6,7 @@ package cn.iocoder.mall.order.api.constant; ...@@ -6,7 +6,7 @@ package cn.iocoder.mall.order.api.constant;
* @author Sin * @author Sin
* @time 2019-03-16 14:32 * @time 2019-03-16 14:32
*/ */
public enum OrderPayStatusEnum { public enum OrderPayStatus {
WAITING_PAYMENT(0, "等待支付"), WAITING_PAYMENT(0, "等待支付"),
SUCCESSFUL_PAYMENT(1, "支付成功"), SUCCESSFUL_PAYMENT(1, "支付成功"),
...@@ -19,7 +19,7 @@ public enum OrderPayStatusEnum { ...@@ -19,7 +19,7 @@ public enum OrderPayStatusEnum {
private final String name; private final String name;
OrderPayStatusEnum(int value, String name) { OrderPayStatus(int value, String name) {
this.value = value; this.value = value;
this.name = name; this.name = name;
} }
......
package cn.iocoder.mall.order.api.constant;
/**
* 支付 AppId
*
* @author Sin
* @time 2019-04-08 19:54
*/
public class PayAppId {
/**
* 电商
*/
public static final String APP_ID_1024 = "1024";
}
...@@ -3,8 +3,6 @@ package cn.iocoder.mall.order.api.dto; ...@@ -3,8 +3,6 @@ package cn.iocoder.mall.order.api.dto;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
...@@ -23,34 +21,20 @@ public class OrderCreateDTO implements Serializable { ...@@ -23,34 +21,20 @@ public class OrderCreateDTO implements Serializable {
*/ */
private Integer userId; private Integer userId;
/** /**
* 收件区域编号 * 用户地址
*/ */
@NotNull private Integer userAddressId;
private String areaNo;
/**
* 收件人名称
*/
@NotNull
private String name;
/**
* 收件手机号
*/
@NotNull
private String mobile;
/**
* 收件详细地址
*/
@NotNull
private String address;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* ip信息
*/
private String ip;
/// ///
/// order item /// order item
@NotNull
@Size(max = 1000, min = 1)
private List<OrderCreateItemDTO> orderItems; private List<OrderCreateItemDTO> orderItems;
} }
package cn.iocoder.mall.order.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 用户订单 page
*
* @author Sin
* @time 2019-04-08 17:50
*/
@Data
@Accessors(chain = true)
public class OrderUserPageDTO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 订单号
*/
private String orderNo;
/**
* 用户 id
*/
private Integer userId;
/**
* 付款时间(待发货)
*/
private Date startPaymentTime;
private Date endPaymentTime;
/**
* 创建时间
*/
private Date startCreateTime;
private Date endCreateTime;
/**
* 状态
*/
private Integer status;
}
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
<artifactId>order-service-impl</artifactId> <artifactId>order-service-impl</artifactId>
<properties>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
<org.projectlombok.version>1.16.14</org.projectlombok.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
...@@ -28,6 +23,19 @@ ...@@ -28,6 +23,19 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
...@@ -47,43 +55,27 @@ ...@@ -47,43 +55,27 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>27.0.1-jre</version> <version>27.0.1-jre</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>Pingplusplus</groupId> <groupId>Pingplusplus</groupId>
<artifactId>pingpp-java</artifactId> <artifactId>pingpp-java</artifactId>
<version>2.2.4</version> <version>2.2.4</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId> <artifactId>xxl-job-core</artifactId>
<version>2.0.1</version> <version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId> <artifactId>rocketmq-spring-boot-starter</artifactId>
...@@ -108,6 +100,12 @@ ...@@ -108,6 +100,12 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -116,23 +114,6 @@ ...@@ -116,23 +114,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -3,6 +3,7 @@ package cn.iocoder.mall.order.biz.convert; ...@@ -3,6 +3,7 @@ package cn.iocoder.mall.order.biz.convert;
import cn.iocoder.mall.order.api.bo.OrderRecipientBO; import cn.iocoder.mall.order.api.bo.OrderRecipientBO;
import cn.iocoder.mall.order.api.dto.OrderCreateDTO; import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
import cn.iocoder.mall.order.biz.dataobject.OrderRecipientDO; import cn.iocoder.mall.order.biz.dataobject.OrderRecipientDO;
import cn.iocoder.mall.user.api.bo.UserAddressBO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
...@@ -23,6 +24,9 @@ public interface OrderRecipientConvert { ...@@ -23,6 +24,9 @@ public interface OrderRecipientConvert {
@Mappings({}) @Mappings({})
OrderRecipientDO convert(OrderCreateDTO orderCreateDTO); OrderRecipientDO convert(OrderCreateDTO orderCreateDTO);
@Mappings({})
OrderRecipientDO convert(UserAddressBO userAddressBO);
@Mappings({}) @Mappings({})
OrderRecipientBO convert(OrderRecipientDO orderRecipientDO); OrderRecipientBO convert(OrderRecipientDO orderRecipientDO);
......
...@@ -32,6 +32,10 @@ public class OrderItemDO extends DeletableDO { ...@@ -32,6 +32,10 @@ public class OrderItemDO extends DeletableDO {
* 商品编号 * 商品编号
*/ */
private Integer skuId; private Integer skuId;
/**
* 物流id
*/
private Integer orderLogisticsId;
/** /**
* 商品名称 * 商品名称
*/ */
...@@ -52,10 +56,6 @@ public class OrderItemDO extends DeletableDO { ...@@ -52,10 +56,6 @@ public class OrderItemDO extends DeletableDO {
* 支付金额(实付金额) * 支付金额(实付金额)
*/ */
private Integer payAmount; private Integer payAmount;
/**
* 物流id
*/
private Integer orderLogisticsId;
/// ///
/// 时间信息 /// 时间信息
......
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
<mapper namespace="cn.iocoder.mall.order.biz.dao.OrderItemMapper"> <mapper namespace="cn.iocoder.mall.order.biz.dao.OrderItemMapper">
<sql id="FIELDS"> <sql id="FIELDS">
id, order_id, order_no, sku_id, sku_name, sku_image, quantity, price, pay_amount, id, order_id, order_no, sku_id, sku_name, sku_image, order_logistics_id,
quantity, price, pay_amount,
payment_time, delivery_time, receiver_time, closing_time, payment_time, delivery_time, receiver_time, closing_time,
has_return_exchange, delivery_type, status, create_time, update_time, deleted has_return_exchange, delivery_type, status,
create_time, update_time, deleted
</sql> </sql>
<!-- <!--
...@@ -13,11 +15,14 @@ ...@@ -13,11 +15,14 @@
--> -->
<insert id="insert" parameterType="OrderItemDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id"> <insert id="insert" parameterType="OrderItemDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO `order_item` ( INSERT INTO `order_item` (
order_id, order_no, sku_id, sku_name, sku_image, quantity, price, pay_amount, order_id, order_no, sku_id, sku_name, sku_image, order_logistics_id,
quantity, price, pay_amount,
payment_time, delivery_time, receiver_time, closing_time, payment_time, delivery_time, receiver_time, closing_time,
has_return_exchange, delivery_type, status, create_time, update_time, deleted has_return_exchange, delivery_type, status,
create_time, update_time, deleted
) VALUES ( ) VALUES (
#{orderId}, #{orderNo}, #{skuId}, #{quantity}, #{price}, #{orderId}, #{orderNo}, #{skuId}, #{skuName}, #{skuImage}, #{orderLogisticsId},
#{quantity}, #{price}, #{payAmount},
#{paymentTime}, #{deliveryTime}, #{receiverTime}, #{closingTime}, #{paymentTime}, #{deliveryTime}, #{receiverTime}, #{closingTime},
#{hasReturnExchange}, #{deliveryType}, #{status}, #{hasReturnExchange}, #{deliveryType}, #{status},
#{createTime}, #{updateTime}, #{deleted} #{createTime}, #{updateTime}, #{deleted}
......
...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
--> -->
<insert id="insert" parameterType="OrderDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id"> <insert id="insert" parameterType="OrderDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO `order` ( INSERT INTO `order` (
user_id, order_no, price, payment_time, user_id, order_no, pay_amount, payment_time,
delivery_time, receiver_time, closing_time, delivery_time, receiver_time, closing_time,
has_return_exchange, status, remark, has_return_exchange,
create_time, update_time, `deleted` status, remark, create_time, update_time, `deleted`
) VALUES ( ) VALUES (
#{userId}, #{orderNo}, #{price}, #{paymentTime}, #{userId}, #{orderNo}, #{payAmount}, #{paymentTime},
#{deliveryTime}, #{receiverTime}, #{closingTime}, #{deliveryTime}, #{receiverTime}, #{closingTime},
#{hasReturnExchange}, #{status}, #{remark}, #{hasReturnExchange},
#{createTime}, #{updateTime}, #{deleted} #{status}, #{remark}, #{createTime}, #{updateTime}, #{deleted}
) )
</insert> </insert>
......
...@@ -36,24 +36,24 @@ public class OrderServiceImplTest { ...@@ -36,24 +36,24 @@ public class OrderServiceImplTest {
@Test @Test
public void createOrderTest() { public void createOrderTest() {
//
Integer userId = 1; // Integer userId = 1;
OrderCreateItemDTO orderCreateItemDTO // OrderCreateItemDTO orderCreateItemDTO
= new OrderCreateItemDTO() // = new OrderCreateItemDTO()
.setSkuId(1) // .setSkuId(1)
.setQuantity(1); // .setQuantity(1);
//
CommonResult<OrderCreateBO> result = orderService.createOrder( // CommonResult<OrderCreateBO> result = orderService.createOrder(
userId, // userId,
new OrderCreateDTO() // new OrderCreateDTO()
.setRemark("") // .setRemark("")
.setName("张三") // .setName("张三")
.setMobile("13301926050") // .setMobile("13301926050")
.setAddress("深圳市福田区") // .setAddress("深圳市福田区")
.setAreaNo("1000100") // .setAreaNo("1000100")
.setOrderItems(Arrays.asList(orderCreateItemDTO))); // .setOrderItems(Arrays.asList(orderCreateItemDTO)));
//
OrderDO orderDO = orderMapper.selectById(result.getData().getId()); // OrderDO orderDO = orderMapper.selectById(result.getData().getId());
Assert.assertNotNull("创建的订单不存在!", orderDO); // Assert.assertNotNull("创建的订单不存在!", orderDO);
} }
} }
...@@ -3,13 +3,15 @@ package cn.iocoder.mall.user.api.bo; ...@@ -3,13 +3,15 @@ package cn.iocoder.mall.user.api.bo;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* @author Sin * @author Sin
* @time 2019-04-06 13:28 * @time 2019-04-06 13:28
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class UserAddressBO { public class UserAddressBO implements Serializable {
/** /**
......
...@@ -3,11 +3,12 @@ package cn.iocoder.mall.user.api.bo; ...@@ -3,11 +3,12 @@ package cn.iocoder.mall.user.api.bo;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class UserBO { public class UserBO implements Serializable {
/** /**
* 用户编号 * 用户编号
......
...@@ -3,11 +3,12 @@ package cn.iocoder.mall.user.api.bo; ...@@ -3,11 +3,12 @@ package cn.iocoder.mall.user.api.bo;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List; import java.util.List;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class UserPageBO { public class UserPageBO implements Serializable {
/** /**
* 用户数组 * 用户数组
......
...@@ -24,6 +24,7 @@ import java.util.List; ...@@ -24,6 +24,7 @@ import java.util.List;
* @time 2019-04-06 13:26 * @time 2019-04-06 13:26
*/ */
@Service @Service
@com.alibaba.dubbo.config.annotation.Service(validation = "true")
public class UserAddressServiceImpl implements UserAddressService { public class UserAddressServiceImpl implements UserAddressService {
@Autowired @Autowired
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论