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

- 后端：临时解决 Dubbo 内嵌在 Spring Boot 时，对本地的 Dubbo Service 引用报错的问题。

Browse Source 
- 前端：完善商品推荐
- 前端：完善优惠劵
This commit is contained in:
YunaiV
2019-05-07 19:33:16 +08:00
parent ab5d051f75
commit d39a416080
69 changed files with 743 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
admin-web/src/models/promotion/couponCardTemplateList.js
View File

@@ -6,6 +6,7 @@ import {
getCouponCardTemplatePage,
} from '../../services/promotion';
import PaginationHelper from '../../../helpers/PaginationHelper';
import {productSpuList, productSpuSearchList} from "../../services/product";
const SEARCH_PARAMS_DEFAULT = {
title: '',
@@ -26,6 +27,7 @@ export default {
modalType: undefined, // 'add' or 'update' 表单
formVals: {}, // 当前表单值
modalLoading: false,
searchProductSpuList: [],
},
effects: {
@@ -153,6 +155,33 @@ export default {
// }
// },
* searchProductSpu({ payload }, { call, put }) {
// 请求
const response = yield call(productSpuSearchList, payload);
// 响应
if (response.code === 0) {
yield put({
type: 'setAll',
payload: {
searchProductSpuList: response.data,
},
});
}
},
* getProductSpuList({ payload }, { call, put }) {
// 请求
const response = yield call(productSpuList, payload);
// 响应
if (response.code === 0) {
yield put({
type: 'setAll',
payload: {
formSpuValues: response.data,
},
});
}
}
},
reducers: {

16
admin-web/src/models/promotion/productRecommendList.js
View File

@@ -7,6 +7,7 @@ import {
updateProductRecommendStatus,
} from '../../services/promotion';
import PaginationHelper from '../../../helpers/PaginationHelper';
import {productSpuList, productSpuSearchList} from "../../services/product";
const SEARCH_PARAMS_DEFAULT = {
type: undefined,
@@ -27,6 +28,8 @@ export default {
modalType: undefined, // 'add' or 'update' 表单
formVals: {}, // 当前表单值
modalLoading: false,
searchProductSpuList: [], // 搜索商品
formSpuValues: [], // 编辑时，如果优惠劵选择的是商品，则需要获取该值。
},
effects: {
@@ -151,6 +154,19 @@ export default {
}
},
* searchProductSpu({ payload }, { call, put }) {
// 请求
const response = yield call(productSpuSearchList, payload);
// 响应
if (response.code === 0) {
yield put({
type: 'setAll',
payload: {
searchProductSpuList: response.data,
},
});
}
},
},
reducers: {

2
admin-web/src/pages/Product/ProductSpuList.js
View File

@@ -217,7 +217,7 @@ const SearchForm = Form.create()(props => {
</FormItem>
</Col>
<Col md={8} sm={24}>
<FormItem label="商品名称">
<FormItem label="商品分类">
{getFieldDecorator('cid')(
<TreeSelect
showSearch

158
admin-web/src/pages/Promotion/CouponCardTemplateList.js
View File

@@ -18,7 +18,7 @@ import {
Select,
Icon,
InputNumber,
DatePicker
DatePicker, TreeSelect
} from 'antd';
import { checkTypeWithEnglishAndNumbers } from '../../../helpers/validator'
import PageHeaderWrapper from '@/components/PageHeaderWrapper';
@@ -145,10 +145,10 @@ function List ({ dataSource, loading, pagination, searchParams, dispatch,
dataIndex: 'status',
render: val => <span>{status[val]}</span>,
},
{
title: '使用说明',
dataIndex: 'description',
},
// {
// title: '使用说明',
// dataIndex: 'description',
// },
{
title: '创建时间',
dataIndex: 'createTime',
@@ -264,18 +264,20 @@ const SearchForm = Form.create()(props => {
// 添加 or 修改 Form 表单
const AddOrUpdateForm = Form.create()(props => {
const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals } = props;
const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals,
searchProductSpuList, formSpuValues, categoryTree} = props;
const okHandle = () => {
form.validateFields((err, fields) => {
if (err) return;
let newFileds = {
let newFields = {
...fields,
priceAvailable: fields.priceAvailable ? parseInt(fields.priceAvailable * 100) : undefined,
priceOff: fields.priceOff ? parseInt(fields.priceOff * 100) : undefined,
discountPriceLimit: fields.discountPriceLimit ? parseInt(fields.discountPriceLimit * 100) : undefined,
validStartTime: fields.validStartTime ? fields.validStartTime.format('YYYY-MM-DD') : undefined,
validEndTime: fields.validEndTime ? fields.validEndTime.format('YYYY-MM-DD') : undefined
validEndTime: fields.validEndTime ? fields.validEndTime.format('YYYY-MM-DD') : undefined,
rangeValues: fields.rangeValues && fields.rangeValues.length > 0 ? fields.rangeValues.join(',') : undefined,
};
// 添加表单
if (modalType === 'add') {
@@ -283,7 +285,7 @@ const AddOrUpdateForm = Form.create()(props => {
type: 'couponCardTemplateList/add',
payload: {
body: {
...newFileds,
...newFields,
},
callback: () => {
// 清空表单
@@ -302,7 +304,7 @@ const AddOrUpdateForm = Form.create()(props => {
payload: {
body: {
id: formVals.id,
...newFileds,
...newFields,
priceAvailable: undefined,
dateType: undefined,
validStartTime: undefined,
@@ -340,6 +342,42 @@ const AddOrUpdateForm = Form.create()(props => {
formVals.preferentialType = parseInt(value);
}
const searchProductSpu = (value) => {
if (!value) {
dispatch({
type: 'couponCardTemplateList/setAll',
payload: {
searchProductSpuList: [],
},
});
return;
}
dispatch({
type: 'couponCardTemplateList/searchProductSpu',
payload: {
name: value,
},
});
};
// 处理分类筛选
const buildSelectTree = (list) => {
return list.map(item => {
let children = [];
if (item.children) {
children = buildSelectTree(item.children);
}
return {
title: item.name,
value: item.id,
key: item.id,
children,
selectable: item.pid > 0
};
});
};
let categoryTreeSelect = buildSelectTree(categoryTree);
const title = modalType === 'add' ? '新建优惠劵' : '更新优惠劵';
return (
<Modal
@@ -392,14 +430,14 @@ const AddOrUpdateForm = Form.create()(props => {
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="使用金额门槛">
{form.getFieldDecorator('priceAvailable', {
rules: [{ required: true, message: '请输入使用金额门槛！' },],
initialValue: formVals.priceAvailable / 100.0,
initialValue: formVals.priceAvailable ? formVals.priceAvailable / 100.0 : undefined,
})(<InputNumber disabled={modalType != 'add'} placeholder="请输入" />)} 元
</FormItem>
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="可用范围">
{form.getFieldDecorator('rangeType', {
rules: [{ required: true, message: '请选择可用范围！'}, // TODO 芋艿，需要修改
],
initialValue: formVals.rangeType + '',
initialValue: formVals.rangeType ? formVals.rangeType + '' : undefined,
})(
<Select placeholder="请选择" style={{ maxWidth: 200, width: '100%' }} onChange={onRangeTypeChange} >
<SelectOption value="10">所有可用</SelectOption>
@@ -410,24 +448,70 @@ const AddOrUpdateForm = Form.create()(props => {
</Select>
)}
</FormItem>
{/*{*/}
{/* formVals.rangeType == 20 || formVals.rangeType == 21*/}
{/* || formVals.rangeType == 30 || formVals.rangeType == 31 ?*/}
{/* <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="具体范围">*/}
{/* {form.getFieldDecorator('rangeValues', {*/}
{/* rules: [{ required: true, message: '请输入具体范围！' }, // TODO 芋艿，做成搜索*/}
{/* {maxlength: 255, message: '最大长度为 255 位'},*/}
{/* ],*/}
{/* initialValue: formVals.rangeValues,*/}
{/* })(<Input.TextArea placeholder="请输入" />)}*/}
{/* </FormItem>*/}
{/* : ''*/}
{/*}*/}
{
formVals.rangeType == 20 || formVals.rangeType == 21
|| formVals.rangeType == 30 || formVals.rangeType == 31 ?
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="具体范围">
formVals.rangeType == 20 || formVals.rangeType == 21?
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="选择商品">
{form.getFieldDecorator('rangeValues', {
rules: [{ required: true, message: '请输入具体范围！' }, // TODO 芋艿，做成搜索
{maxlength: 255, message: '最大长度为 255 位'},
rules: [{ required: true, message: '请选择商品！' },
],
initialValue: formVals.rangeValues,
})(<Input.TextArea placeholder="请输入" />)}
initialValue: formVals.rangeValues ? formVals.rangeValues.split(',') : undefined,
})(
<Select
// labelInValue
// value={formVals.productSpuId}
mode={"multiple"}
placeholder="请搜索商品"
onSearch={searchProductSpu}
showSearch={true}
filterOption={false}
style={{ width: '100%' }}
>
{searchProductSpuList.map(d => <Option key={d.id} value={d.id + ''}>{d.name}</Option>)}
{searchProductSpuList.length === 0 && formSpuValues.length > 0 ?
formSpuValues.map(d => <Option key={d.id} value={d.id + ''}>{d.name}</Option>) : ''}
</Select>
)}
</FormItem>
: ''
: ''
}
{
formVals.rangeType == 30 || formVals.rangeType == 31 ?
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="选择分类">
{form.getFieldDecorator('rangeValues', {
rules: [{ required: true, message: '请选择分类！' },
],
initialValue: formVals.rangeValues ? formVals.rangeValues.split(',') : undefined,
})(
<TreeSelect
showSearch
multiple
style={{ width: 200 }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={categoryTreeSelect}
placeholder="请选择分类"
/>
)}
</FormItem>
: ''
}
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="生效日期类型">
{form.getFieldDecorator('dateType', {
rules: [{ required: true, message: '请选择可用范围！'}, // TODO 芋艿，需要修改
],
initialValue: formVals.dateType + '',
initialValue: formVals.dateType ? formVals.dateType + '' : undefined,
})(
<Select disabled={modalType != 'add'} placeholder="请选择" style={{ maxWidth: 200, width: '100%' }} onChange={onDateTypeChange}>
<SelectOption value="1">固定日期</SelectOption>
@@ -470,7 +554,7 @@ const AddOrUpdateForm = Form.create()(props => {
{form.getFieldDecorator('preferentialType', {
rules: [{ required: true, message: '请选择优惠类型！'}, // TODO 芋艿，需要修改
],
initialValue: formVals.preferentialType + '',
initialValue: formVals.preferentialType ? formVals.preferentialType + '' : undefined,
})(
<Select disabled={modalType != 'add'} placeholder="请选择" style={{ maxWidth: 200, width: '100%' }} onChange={onPreferentialTypeChange}>
<SelectOption value="1">代金卷</SelectOption>
@@ -513,10 +597,11 @@ const AddOrUpdateForm = Form.create()(props => {
);
});
@connect(({ couponCardTemplateList }) => ({
@connect(({ couponCardTemplateList, productCategoryList }) => ({
// list: productRecommend.list,
// pagination: productRecommend.pagination,
...couponCardTemplateList,
categoryTree: productCategoryList.list,
}))
// 主界面
@@ -525,6 +610,7 @@ class CouponCardTemplateLists extends PureComponent {
componentDidMount() {
const { dispatch } = this.props;
// 获得优惠劵列表
dispatch({
type: 'couponCardTemplateList/query',
payload: {
@@ -535,21 +621,40 @@ class CouponCardTemplateLists extends PureComponent {
handleModalVisible = (modalVisible, modalType, record) => {
const { dispatch } = this.props;
// 弹窗，并清空一些缓存
dispatch({
type: 'couponCardTemplateList/setAll',
payload: {
modalVisible,
modalType,
formVals: record || {}
formVals: record || {},
searchProductSpuList: [],
formSpuValues: [],
},
});
// 如果是指定商品，则获得商品列表
if (record && record.rangeType &&
(record.rangeType === 20 || record.rangeType === 21)) {
dispatch({
type: 'couponCardTemplateList/getProductSpuList',
payload: {
ids: record.rangeValues,
},
});
}
// 获得商品分类，因为后续可能使用到
// 获得商品分类
dispatch({
type: 'productCategoryList/tree',
payload: {},
});
};
render() {
// let that = this;
const { dispatch,
list, listLoading, searchParams, pagination,
modalVisible, modalType, formVals,
modalVisible, modalType, formVals, searchProductSpuList, formSpuValues, categoryTree,
confirmLoading, } = this.props;
// 列表属性
@@ -574,6 +679,9 @@ class CouponCardTemplateLists extends PureComponent {
modalType,
formVals,
dispatch,
searchProductSpuList,
formSpuValues,
categoryTree,
handleModalVisible: this.handleModalVisible, // Function
};

46
admin-web/src/pages/Promotion/ProductRecommendList.js
View File

@@ -211,7 +211,12 @@ const SearchForm = Form.create()(props => {
// 添加 or 修改 Form 表单
const AddOrUpdateForm = Form.create()(props => {
const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals } = props;
const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals,
searchProductSpuList} = props;
// let selectedSearchProductSpu = formVals.productSpuId ? {
// key: formVals.productSpuId,
// label: formVals.productSpuName,
// } : {};
const okHandle = () => {
form.validateFields((err, fields) => {
@@ -257,6 +262,24 @@ const AddOrUpdateForm = Form.create()(props => {
});
};
const searchProductSpu = (value) => {
if (!value) {
dispatch({
type: 'productRecommendList/setAll',
payload: {
searchProductSpuList: [],
},
});
return;
}
dispatch({
type: 'productRecommendList/searchProductSpu',
payload: {
name: value,
},
});
};
const title = modalType === 'add' ? '新建商品推荐' : '更新商品推荐';
return (
<Modal
@@ -284,7 +307,20 @@ const AddOrUpdateForm = Form.create()(props => {
rules: [{ required: true, message: '请输入商品！'}, // TODO 芋艿，临时先输入商品编号，后面做成搜索。
],
initialValue: formVals.productSpuId,
})(<Input placeholder="请输入" />)}
})(
<Select
// labelInValue
// value={formVals.productSpuId}
placeholder="请搜索商品"
onSearch={searchProductSpu}
showSearch={true}
filterOption={false}
style={{ width: '100%' }}
>
{searchProductSpuList.map(d => <Option key={d.id} value={d.id}>{d.name}</Option>)}
{searchProductSpuList.length === 0 && formVals.productSpuId ? <Option key={formVals.productSpuId} value={formVals.productSpuId}>{formVals.productSpuName}</Option> : ''}
</Select>
)}
</FormItem>
<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="排序值">
{form.getFieldDecorator('sort', {
@@ -331,7 +367,8 @@ class BannerList extends PureComponent {
payload: {
modalVisible,
modalType,
formVals: record || {}
formVals: record || {},
searchProductSpuList: [],
},
});
};
@@ -340,7 +377,7 @@ class BannerList extends PureComponent {
// let that = this;
const { dispatch,
list, listLoading, searchParams, pagination,
modalVisible, modalType, formVals,
modalVisible, modalType, formVals, searchProductSpuList,
confirmLoading, } = this.props;
// 列表属性
@@ -365,6 +402,7 @@ class BannerList extends PureComponent {
modalType,
formVals,
dispatch,
searchProductSpuList,
handleModalVisible: this.handleModalVisible, // Function
};

12
admin-web/src/services/product.js
View File

@@ -44,6 +44,18 @@ export async function productSpuPage(params) {
});
}
export async function productSpuSearchList(params) {
return request(`/product-api/admins/spu/search_list?${stringify(params)}`, {
method: 'GET',
});
}
export async function productSpuList(params) {
return request(`/product-api/admins/spu/list?${stringify(params)}`, {
method: 'GET',
});
}
export async function productSpuAdd(params) {
return request(`/product-api/admins/spu/add?${stringify(params)}`, {
method: 'POST',