|
@@ -22,8 +22,12 @@ export class FVO_order {
|
|
|
'source_name': string = undefined;
|
|
|
@ApiProperty({ description: '类型' })
|
|
|
'type': string = undefined;
|
|
|
- @ApiProperty({ description: '总金额' })
|
|
|
+ @ApiProperty({ description: '金额' })
|
|
|
'money': number = undefined;
|
|
|
+ @ApiProperty({ description: '优惠金额' })
|
|
|
+ 'coupon_money': number = undefined;
|
|
|
+ @ApiProperty({ description: '总金额' })
|
|
|
+ 'total_money': number = undefined;
|
|
|
@ApiProperty({ description: '日期' })
|
|
|
'date': string = undefined;
|
|
|
@ApiProperty({ description: '数量' })
|
|
@@ -45,14 +49,14 @@ export class FVO_order {
|
|
|
export class QDTO_order extends SearchBase {
|
|
|
constructor() {
|
|
|
const like_prop = [];
|
|
|
- const props = ['user', 'source', 'type', 'status'];
|
|
|
+ const props = ['user', 'source_name', 'type', 'status'];
|
|
|
const mapping = [];
|
|
|
super({ like_prop, props, mapping });
|
|
|
}
|
|
|
@ApiProperty({ description: '用户' })
|
|
|
'user': string = undefined;
|
|
|
- @ApiProperty({ description: '来源' })
|
|
|
- 'source': object = undefined;
|
|
|
+ @ApiProperty({ description: '来源名称' })
|
|
|
+ 'source_name': string = undefined;
|
|
|
@ApiProperty({ description: '类型' })
|
|
|
'type': string = undefined;
|
|
|
@ApiProperty({ description: '状态' })
|
|
@@ -71,7 +75,7 @@ export class CDTO_order {
|
|
|
@Rule(RuleType['string']().empty(''))
|
|
|
'user': string = undefined;
|
|
|
@ApiProperty({ description: '来源' })
|
|
|
- @Rule(RuleType['string']().empty(''))
|
|
|
+ @Rule(RuleType['object']().empty(''))
|
|
|
'source': object = undefined;
|
|
|
@ApiProperty({ description: '来源名称' })
|
|
|
@Rule(RuleType['string']().empty(''))
|
|
@@ -79,9 +83,15 @@ export class CDTO_order {
|
|
|
@ApiProperty({ description: '类型' })
|
|
|
@Rule(RuleType['string']().empty(''))
|
|
|
'type': string = undefined;
|
|
|
- @ApiProperty({ description: '总金额' })
|
|
|
+ @ApiProperty({ description: '金额' })
|
|
|
@Rule(RuleType['number']().empty(''))
|
|
|
'money': number = undefined;
|
|
|
+ @ApiProperty({ description: '优惠金额' })
|
|
|
+ @Rule(RuleType['number']().empty(''))
|
|
|
+ 'coupon_money': number = undefined;
|
|
|
+ @ApiProperty({ description: '总金额' })
|
|
|
+ @Rule(RuleType['number']().empty(''))
|
|
|
+ 'total_money': number = undefined;
|
|
|
@ApiProperty({ description: '日期' })
|
|
|
@Rule(RuleType['string']().empty(''))
|
|
|
'date': string = undefined;
|