cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

错别字修改

Browse Source
This commit is contained in:
taozi
2021-02-05 10:32:34 +08:00
parent db9baa1f03
commit 1e2efb25e0
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/.yshop.version/yshop-V1.1.pdman.json
View File

@ -3638,7 +3638,7 @@
{ {
"name": "people", "name": "people",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图总人数", "chnname": "拼团总人数",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -4478,7 +4478,7 @@
{ {
"name": "cost", "name": "cost",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图产品成本", "chnname": "拼团产品成本",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -11447,4 +11447,4 @@
} }
], ],
"date": "2020/9/5 17:13:6" "date": "2020/9/5 17:13:6"
} }

6
sql/.yshop.version/yshop-V1.2.pdman.json
View File

@ -3346,7 +3346,7 @@
{ {
"name": "people", "name": "people",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图总人数", "chnname": "拼团总人数",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -4186,7 +4186,7 @@
{ {
"name": "cost", "name": "cost",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图产品成本", "chnname": "拼团产品成本",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -11399,4 +11399,4 @@
} }
], ],
"date": "2020/9/12 23:56:59" "date": "2020/9/12 23:56:59"
} }

6
sql/.yshop.version/yshop-base.pdman.json
View File

@ -3561,7 +3561,7 @@
{ {
"name": "people", "name": "people",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图总人数", "chnname": "拼团总人数",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -4421,7 +4421,7 @@
{ {
"name": "cost", "name": "cost",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图产品成本", "chnname": "拼团产品成本",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -11244,4 +11244,4 @@
"version": "V1.0", "version": "V1.0",
"message": "V1", "message": "V1",
"date": "2020/7/21 12:14:27" "date": "2020/7/21 12:14:27"
} }

4
sql/yshop.pdman.json
View File

@ -3346,7 +3346,7 @@
{ {
"name": "people", "name": "people",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图总人数", "chnname": "拼团总人数",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,
@ -4186,7 +4186,7 @@
{ {
"name": "cost", "name": "cost",
"type": "INT UNSIGNED_10", "type": "INT UNSIGNED_10",
"chnname": "拼图产品成本", "chnname": "拼团产品成本",
"remark": "", "remark": "",
"pk": false, "pk": false,
"notNull": true, "notNull": true,

4
sql/yshop3.2.sql
View File

@ -2004,7 +2004,7 @@ CREATE TABLE `yx_store_combination` (
`start_time` datetime(0) NOT NULL COMMENT '拼团开始时间', `start_time` datetime(0) NOT NULL COMMENT '拼团开始时间',
`stop_time` datetime(0) NOT NULL COMMENT '拼团结束时间', `stop_time` datetime(0) NOT NULL COMMENT '拼团结束时间',
`effective_time` int(11) NOT NULL DEFAULT 0 COMMENT '拼团订单有效时间', `effective_time` int(11) NOT NULL DEFAULT 0 COMMENT '拼团订单有效时间',
`cost` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '拼图产品成本', `cost` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '拼团产品成本',
`browse` int(11) NULL DEFAULT 0 COMMENT '浏览量', `browse` int(11) NULL DEFAULT 0 COMMENT '浏览量',
`unit_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '单位名', `unit_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '单位名',
`spec_type` tinyint(1) NULL DEFAULT NULL COMMENT '规格 0单 1多', `spec_type` tinyint(1) NULL DEFAULT NULL COMMENT '规格 0单 1多',
@ -2282,7 +2282,7 @@ CREATE TABLE `yx_store_pink` (
`total_price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '购买总金额', `total_price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '购买总金额',
`cid` bigint(20) UNSIGNED NOT NULL COMMENT '拼团产品id', `cid` bigint(20) UNSIGNED NOT NULL COMMENT '拼团产品id',
`pid` bigint(20) UNSIGNED NOT NULL COMMENT '产品id', `pid` bigint(20) UNSIGNED NOT NULL COMMENT '产品id',
`people` int(10) UNSIGNED NOT NULL COMMENT '拼图总人数', `people` int(10) UNSIGNED NOT NULL COMMENT '拼团总人数',
`price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '拼团产品单价', `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '拼团产品单价',
`create_time` datetime(0) NOT NULL COMMENT '开始时间', `create_time` datetime(0) NOT NULL COMMENT '开始时间',
`update_time` datetime(0) NULL DEFAULT NULL, `update_time` datetime(0) NULL DEFAULT NULL,

4
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
View File

@ -72,8 +72,8 @@ public class YxStorePink extends BaseDomain {
private Long pid; private Long pid;
/** 拼图总人数 */ /** 拼团总人数 */
@ApiModelProperty(value = "拼图总人数") @ApiModelProperty(value = "拼团总人数")
private Integer people; private Integer people;

2
yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java
View File

@ -109,7 +109,7 @@ public class YxStoreCombinationDto implements Serializable {
// 拼团订单有效时间 // 拼团订单有效时间
private Integer effectiveTime; private Integer effectiveTime;
// 拼图产品成本 // 拼团产品成本
private Integer cost; private Integer cost;
// 浏览量 // 浏览量

2
yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java
View File

@ -42,7 +42,7 @@ public class YxStorePinkDto implements Serializable {
/** 产品id */ /** 产品id */
private Long pid; private Long pid;
/** 拼图总人数 */ /** 拼团总人数 */
private Integer people; private Integer people;
/** 拼团产品单价 */ /** 拼团产品单价 */

2
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
View File

@ -260,7 +260,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
map.put("拼团开始时间", yxStoreCombination.getStartTime()); map.put("拼团开始时间", yxStoreCombination.getStartTime());
map.put("拼团结束时间", yxStoreCombination.getStopTime()); map.put("拼团结束时间", yxStoreCombination.getStopTime());
map.put("拼团订单有效时间", yxStoreCombination.getEffectiveTime()); map.put("拼团订单有效时间", yxStoreCombination.getEffectiveTime());
map.put("拼图产品成本", yxStoreCombination.getCost()); map.put("拼团产品成本", yxStoreCombination.getCost());
map.put("浏览量", yxStoreCombination.getBrowse()); map.put("浏览量", yxStoreCombination.getBrowse());
map.put("单位名", yxStoreCombination.getUnitName()); map.put("单位名", yxStoreCombination.getUnitName());
list.add(map); list.add(map);

2
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
View File

@ -676,7 +676,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
map.put("购买总金额", yxStorePink.getTotalPrice()); map.put("购买总金额", yxStorePink.getTotalPrice());
map.put("拼团产品id", yxStorePink.getCid()); map.put("拼团产品id", yxStorePink.getCid());
map.put("产品id", yxStorePink.getPid()); map.put("产品id", yxStorePink.getPid());
map.put("拼图总人数", yxStorePink.getPeople()); map.put("拼团总人数", yxStorePink.getPeople());
map.put("拼团产品单价", yxStorePink.getPrice()); map.put("拼团产品单价", yxStorePink.getPrice());
map.put(" stopTime", yxStorePink.getStopTime()); map.put(" stopTime", yxStorePink.getStopTime());
map.put("团长id 0为团长", yxStorePink.getKId()); map.put("团长id 0为团长", yxStorePink.getKId());

2
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStorePinkQueryVo.java
View File

@ -50,7 +50,7 @@ public class YxStorePinkQueryVo implements Serializable {
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
private Long pid; private Long pid;
@ApiModelProperty(value = "拼图总人数") @ApiModelProperty(value = "拼团总人数")
private Integer people; private Integer people;
@ApiModelProperty(value = "拼团产品单价") @ApiModelProperty(value = "拼团产品单价")