diff --git a/README.md b/README.md index 71d8023afe6afb68c08ef616f124348109c05253..6967f5c4e2ae2dfe3dbfb55301462303be1ed816 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,12 @@ youlai-mall 1. 本机安装Redis,IDEA安装Lombok插件。 2. 拉取并导入 [youlai-mall](https://github.com/hxrui/youlai-mall) 。 -3. 启动nacos服务。 IDEA进入Terminal命令终端切到youlai-registry/nacos/bin目录,执行命令 startup -m standalone。nacos启动后在控制台导入项目下的document/DEFAULT_GROUP.zip配置。 +3. 启动nacos服务。 IDEA进入Terminal命令终端切到youlai-registry/nacos/bin目录,执行命令 startup -m standalone。 4. 启动youlai-gateway、youlai-auth,youlai-admin基础微服务。 +重要说明:因为会有人无视公告修改公有环境配置,所以大家启动在使用公共环境会报错,作为开发者的我们心也累。 +所以大家在启动报错的时候,麻烦在Nacos启动后在控制台删除原有配置重新导入项目下的document/DEFAULT_GROUP.zip配置尝试重新启动项目。 + 注:默认使用云数据库无需修改数据库连接配置和redis配置,如果需要搭建本地请修改对应配置信息即可。 重要提示: 求大家别在云环境修改数据库和相关配置!自己这套环境开放出来供大家学习本来就冒着很大风险,精力也有限,望大家理解,谢谢了。 diff --git a/mall-pms/pms-search/src/main/java/com/youlai/mall/pms/search/service/impl/PmsSearchServiceImpl.java b/mall-pms/pms-search/src/main/java/com/youlai/mall/pms/search/service/impl/PmsSearchServiceImpl.java index 49f066c3d94155ac7f740e101d050a6796102551..faedb114aec2ffce4c67c253b3e1b70378da973e 100644 --- a/mall-pms/pms-search/src/main/java/com/youlai/mall/pms/search/service/impl/PmsSearchServiceImpl.java +++ b/mall-pms/pms-search/src/main/java/com/youlai/mall/pms/search/service/impl/PmsSearchServiceImpl.java @@ -1,36 +1,18 @@ package com.youlai.mall.pms.search.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.youlai.mall.pms.pojo.PmsSku; import com.youlai.mall.pms.pojo.PmsSpu; import com.youlai.mall.pms.search.service.IPmsSearchService; import com.youlai.mall.pms.search.utils.ElasticsearchConvertUtils; import com.youlai.mall.pms.search.utils.ElasticsearchUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.springframework.data.elasticsearch.core.ElasticsearchOperations; -import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.stereotype.Service; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Map; import static com.youlai.common.core.constant.EsIndexContstants.PMS_SPU; diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsUser.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsUser.java index 250019b08811474bc3729dae4edafd68e592db95..8666cf5e9343664a2703cae925077eda1078b8af 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsUser.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsUser.java @@ -49,4 +49,6 @@ public class UmsUser { @TableField(exist = false) private List addressList; + private Integer balance; + } diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/RechargeDTO.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/RechargeDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..2e5245729e36bc5ca4fea0fec0fe15e7fcf41721 --- /dev/null +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/RechargeDTO.java @@ -0,0 +1,33 @@ +package com.youlai.mall.ums.pojo.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class RechargeDTO { + + @ApiModelProperty(value = "充值金额") + private Integer price; + + @ApiModelProperty(value = "充值说明") + private String name; + + @ApiModelProperty(value = "用来通知指定地址") + private String callbackurl; + + @ApiModelProperty(value = "跳转地址") + private String reurl; + + @ApiModelProperty(value = "用户存放您的用户ID") + private String thirduid; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "其他信息") + private String other; + + +} diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/ResultPayDTO.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/ResultPayDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..72719ff722b4b34e05192a79de9fd4d423545ca8 --- /dev/null +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/ResultPayDTO.java @@ -0,0 +1,19 @@ +package com.youlai.mall.ums.pojo.dto; + +import lombok.Data; + +@Data +public class ResultPayDTO { + + private String code; + private String msg; + private String otherinfo; + private String orderId; + private String price; + private String name; + private String thirduid; + private String paytype; + private String remarks; + private String originalprice; + +}