admin/tmerclub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CueOrder

Browse Source
This commit is contained in:
杨旭 2025-04-22 11:31:56 +08:00
parent e17f79ad85
commit f3305df390
4 changed files with 10 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
tmerclub-common/tmerclub-common-order/src/main/java/com/tmerclub/cloud/common/order/vo/OrderAddrVO.java
View File

@ -3,6 +3,8 @@ package com.tmerclub.cloud.common.order.vo;
import com.tmerclub.cloud.common.vo.BaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.io.Serializable;
@ -13,6 +15,8 @@ import java.io.Serializable;
* @author tmerclub
* @date 2020-12-05 14:13:50
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OrderAddrVO extends BaseVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ -57,136 +61,4 @@ public class OrderAddrVO extends BaseVO implements Serializable {
@Schema(description = "纬度")
private Double lat;
public Long getOrderAddrId() {
return orderAddrId;
}
public void setOrderAddrId(Long orderAddrId) {
this.orderAddrId = orderAddrId;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getConsignee() {
return consignee;
}
public void setConsignee(String consignee) {
this.consignee = consignee;
}
public Long getProvinceId() {
return provinceId;
}
public void setProvinceId(Long provinceId) {
this.provinceId = provinceId;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public Long getCityId() {
return cityId;
}
public void setCityId(Long cityId) {
this.cityId = cityId;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getAddr() {
return addr;
}
public void setAddr(String addr) {
this.addr = addr;
}
public String getPostCode() {
return postCode;
}
public void setPostCode(String postCode) {
this.postCode = postCode;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public Double getLng() {
return lng;
}
public void setLng(Double lng) {
this.lng = lng;
}
public Double getLat() {
return lat;
}
public void setLat(Double lat) {
this.lat = lat;
}
@Override
public String toString() {
return "OrderAddrVO{" +
"orderAddrId=" + orderAddrId +
", userId=" + userId +
", consignee='" + consignee + '\'' +
", provinceId=" + provinceId +
", province='" + province + '\'' +
", cityId=" + cityId +
", city='" + city + '\'' +
", areaId=" + areaId +
", area='" + area + '\'' +
", addr='" + addr + '\'' +
", postCode='" + postCode + '\'' +
", mobile='" + mobile + '\'' +
", lng=" + lng +
", lat=" + lat +
'}';
}
}

145
tmerclub-common/tmerclub-common-order/src/main/java/com/tmerclub/cloud/common/order/vo/UserAddrVO.java
View File

@ -3,6 +3,8 @@ package com.tmerclub.cloud.common.order.vo;
import com.tmerclub.cloud.common.vo.BaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.io.Serializable;
@ -13,6 +15,8 @@ import java.io.Serializable;
* @author tmerclub
* @date 2020-12-07 15:50:02
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class UserAddrVO extends BaseVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ -60,145 +64,4 @@ public class UserAddrVO extends BaseVO implements Serializable {
@Schema(description = "纬度")
private Double lat;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getAddrId() {
return addrId;
}
public void setAddrId(Long addrId) {
this.addrId = addrId;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public Integer getIsDefault() {
return isDefault;
}
public void setIsDefault(Integer isDefault) {
this.isDefault = isDefault;
}
public String getConsignee() {
return consignee;
}
public void setConsignee(String consignee) {
this.consignee = consignee;
}
public Long getProvinceId() {
return provinceId;
}
public void setProvinceId(Long provinceId) {
this.provinceId = provinceId;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public Long getCityId() {
return cityId;
}
public void setCityId(Long cityId) {
this.cityId = cityId;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getPostCode() {
return postCode;
}
public void setPostCode(String postCode) {
this.postCode = postCode;
}
public String getAddr() {
return addr;
}
public void setAddr(String addr) {
this.addr = addr;
}
public Double getLng() {
return lng;
}
public void setLng(Double lng) {
this.lng = lng;
}
public Double getLat() {
return lat;
}
public void setLat(Double lat) {
this.lat = lat;
}
@Override
public String toString() {
return "UserAddrVO{" +
"addrId=" + addrId +
", mobile='" + mobile + '\'' +
", userId=" + userId +
", isDefault=" + isDefault +
", consignee='" + consignee + '\'' +
", provinceId=" + provinceId +
", province='" + province + '\'' +
", cityId=" + cityId +
", city='" + city + '\'' +
", areaId=" + areaId +
", area='" + area + '\'' +
", postCode='" + postCode + '\'' +
", addr='" + addr + '\'' +
", lng=" + lng +
", lat=" + lat +
'}';
}
}

1
tmerclub-common/tmerclub-common-security/src/main/java/com/tmerclub/cloud/common/security/adapter/DefaultAuthConfigAdapter.java
View File

@ -29,6 +29,7 @@ public class DefaultAuthConfigAdapter implements AuthConfigAdapter {
SET.add("/wx/jsapi/createJsapiSignature");
SET.add("/admin/**/**");
SET.add("/app/**/**");
SET.add("/mp/**/**");
}
private static final Logger logger = LoggerFactory.getLogger(DefaultAuthConfigAdapter.class);

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
View File

@ -191,7 +191,7 @@ public class CreateOrderManager {
ServerResponseEntity<UserAddrVO> userAddrVO = userAddrFeignClient.cueGetUserAddrByAddrId(cueFillAddrDTO.getAddrId(), cueOrderVO.getUserId());
if (userAddrVO.isSuccess()) {
// 将地址信息插入到order_addr中
OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO, OrderAddrVO.class);
OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO.getData(), OrderAddrVO.class);
orderAddrVO.setUserId(cueOrderVO.getUserId());
ServerResponseEntity<Long> longServerResponseEntity = orderAddrFeignClient.addCueAddr(orderAddrVO);
if (longServerResponseEntity.isSuccess()) {