diff --git a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java index 29e254d..967529d 100644 --- a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java +++ b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java @@ -25,7 +25,7 @@ public class MqConst { public static final String QUEUE_GOODS_LOWER = "xlcs.goods.lower"; /** - * 团长上下线 + * 配送员上下线 */ public static final String EXCHANGE_LEADER_DIRECT = "xlcs.leader.direct"; public static final String ROUTING_LEADER_UPPER = "xlcs.leader.upper"; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/OrderStatus.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/OrderStatus.java index 31631b9..b151cc5 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/OrderStatus.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/OrderStatus.java @@ -5,7 +5,7 @@ import lombok.Getter; @Getter public enum OrderStatus { - //订单状态【0->待付款;1->待发货;2->待团长收货;3->待用户收货,已完成;-1->已取消】 + //订单状态【0->待付款;1->待发货;2->待配送员收货;3->待用户收货,已完成;-1->已取消】 UNPAID(0, "待支付"), WAITING_DELEVER(1, "待发货"), WAITING_TAKE(2, "待提货"), diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/UserType.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/UserType.java index 7c53c84..8b4855c 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/UserType.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/UserType.java @@ -10,7 +10,7 @@ import lombok.Getter; @Getter public enum UserType { USER(0, "会员"), - LEADER(1, "团长"); + LEADER(1, "配送员"); @EnumValue private Integer code; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderDeliver.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderDeliver.java index d864a95..57b7179 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderDeliver.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderDeliver.java @@ -20,7 +20,7 @@ public class OrderDeliver extends BaseEntity { @TableField("deliver_date") private Date deliverDate; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") @TableField("leader_id") private Long leaderId; @@ -36,7 +36,7 @@ public class OrderDeliver extends BaseEntity { @TableField("driver_phone") private String driverPhone; - @ApiModelProperty(value = "状态(0:默认,1:已发货,2:团长收货)") + @ApiModelProperty(value = "状态(0:默认,1:已发货,2:配送员收货)") @TableField("status") private Integer status; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderInfo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderInfo.java index 0943034..cbf900e 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderInfo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderInfo.java @@ -73,7 +73,7 @@ public class OrderInfo extends BaseEntity { @TableField("source_type") private Integer sourceType; - @ApiModelProperty(value = "订单状态【0->待付款;1->待发货;2->待团长收货;3->待用户收货,已完成;-1->已取消】") + @ApiModelProperty(value = "订单状态【0->待付款;1->待发货;2->待配送员收货;3->待用户收货,已完成;-1->已取消】") @TableField("order_status") private OrderStatus orderStatus; @@ -81,15 +81,15 @@ public class OrderInfo extends BaseEntity { @TableField("process_status") private ProcessStatus processStatus; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") @TableField("leader_id") private Long leaderId; - @ApiModelProperty(value = "团长名称") + @ApiModelProperty(value = "配送员名称") @TableField("leader_name") private String leaderName; - @ApiModelProperty(value = "团长手机") + @ApiModelProperty(value = "配送员手机") @TableField("leader_phone") private String leaderPhone; @@ -162,7 +162,7 @@ public class OrderInfo extends BaseEntity { @TableField("ware_id") private Long wareId; - @ApiModelProperty(value = "团长佣金") + @ApiModelProperty(value = "配送员佣金") @TableField("commission_amount") private BigDecimal commissionAmount; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderItem.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderItem.java index 94423aa..0c3d912 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderItem.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderItem.java @@ -61,7 +61,7 @@ public class OrderItem extends BaseEntity { @TableField("split_total_amount") private BigDecimal splitTotalAmount; - @ApiModelProperty(value = "团长id(冗余)") + @ApiModelProperty(value = "配送员id(冗余)") @TableField("leader_id") private Long leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderReturnApply.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderReturnApply.java index bd80986..818bc4b 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderReturnApply.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderReturnApply.java @@ -20,7 +20,7 @@ public class OrderReturnApply extends BaseEntity { @TableField("order_id") private Long orderId; - @ApiModelProperty(value = "团长门店id") + @ApiModelProperty(value = "配送员门店id") @TableField("leader_id") private Long leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderAccount.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderAccount.java index 927458c..bb44c6e 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderAccount.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderAccount.java @@ -16,7 +16,7 @@ public class LeaderAccount extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") @TableField("leader_id") private Long leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBank.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBank.java index 23f4991..ea88c63 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBank.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBank.java @@ -14,7 +14,7 @@ public class LeaderBank extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") @TableField("leader_id") private String leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBill.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBill.java index cb3f596..6ac314d 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBill.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBill.java @@ -18,7 +18,7 @@ public class LeaderBill extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") @TableField("leader_id") private Long leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderUser.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderUser.java index ccd915e..7a9fa3a 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderUser.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderUser.java @@ -14,7 +14,7 @@ public class LeaderUser extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") @TableField("leader_id") private String leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderWithdraw.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderWithdraw.java index 5ff9db7..8a5c39b 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderWithdraw.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderWithdraw.java @@ -16,7 +16,7 @@ public class LeaderWithdraw extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") @TableField("leader_id") private String leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/UserDelivery.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/UserDelivery.java index fd1cfad..26f67eb 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/UserDelivery.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/UserDelivery.java @@ -18,7 +18,7 @@ public class UserDelivery extends BaseEntity { @TableField("user_id") private Long userId; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") @TableField("leader_id") private Long leaderId; diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java index 01a09bf..063efac 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java @@ -24,7 +24,7 @@ public class OrderConfirmVo implements Serializable { @ApiModelProperty(value = "预生产订单号") private String orderNo; - @ApiModelProperty(value = "用户对应的团长地址") + @ApiModelProperty(value = "用户对应的配送员地址") private LeaderAddressVo leaderAddressVo; @ApiModelProperty(value = "购物项列表") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderDeliverVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderDeliverVo.java index 44da02d..9de420a 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderDeliverVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderDeliverVo.java @@ -18,7 +18,7 @@ public class OrderDeliverVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd") private Date deliverDate; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") private Long leaderId; @ApiModelProperty(value = "司机id") @@ -30,7 +30,7 @@ public class OrderDeliverVo implements Serializable { @ApiModelProperty(value = "司机电话") private String driverPhone; - @ApiModelProperty(value = "状态(0:默认,1:已发货,2:团长收货)") + @ApiModelProperty(value = "状态(0:默认,1:已发货,2:配送员收货)") private Integer status; } diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java index fab3c1e..03e1909 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java @@ -22,10 +22,10 @@ public class OrderMqVo implements Serializable { @ApiModelProperty(value = "订单号") private String orderNo; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") private Long leaderId; - @ApiModelProperty(value = "团长佣金") + @ApiModelProperty(value = "配送员佣金") private BigDecimal commissionAmount; @ApiModelProperty(value = "订单项列表") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderQueryVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderQueryVo.java index 4176680..4110c1f 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderQueryVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderQueryVo.java @@ -17,7 +17,7 @@ public class OrderQueryVo { @ApiModelProperty(value = "订单状态") private OrderStatus orderStatus; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") private Long leaderId; @ApiModelProperty(value = "仓库id") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderSubmitVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderSubmitVo.java index 1623625..7d56d18 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderSubmitVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderSubmitVo.java @@ -12,7 +12,7 @@ public class OrderSubmitVo { @ApiModelProperty(value = "用户id") private Long userId; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") private Long leaderId; @ApiModelProperty(value = "收货人姓名") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java index 7d57c58..3cb81eb 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java @@ -19,13 +19,13 @@ public class LeaderAddressVo { @ApiModelProperty(value = "用户id") private Long userId; - @ApiModelProperty(value = "团长id") + @ApiModelProperty(value = "配送员id") private Long leaderId; - @ApiModelProperty(value = "团长名称") + @ApiModelProperty(value = "配送员名称") private String leaderName; - @ApiModelProperty(value = "团长电话") + @ApiModelProperty(value = "配送员电话") private String leaderPhone; @ApiModelProperty(value = "仓库id") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderBillQueryVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderBillQueryVo.java index a667f1f..dc26733 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderBillQueryVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderBillQueryVo.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; @Data public class LeaderBillQueryVo { - @ApiModelProperty(value = "团长ID") + @ApiModelProperty(value = "配送员ID") private String leaderId; @ApiModelProperty(value = "账单类型") diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/UserLoginVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/UserLoginVo.java index f567198..65f33b2 100644 --- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/UserLoginVo.java +++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/UserLoginVo.java @@ -27,7 +27,7 @@ public class UserLoginVo implements Serializable { @ApiModelProperty(value = "是否新用户") private Integer isNew; - @ApiModelProperty(value = "当前登录用户团长id") + @ApiModelProperty(value = "当前登录用户配送员id") private Long leaderId; @ApiModelProperty(value = "仓库id") diff --git a/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml b/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml index 17c4d68..78032f5 100644 --- a/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml @@ -85,7 +85,8 @@ - ${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -140,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml index 12ebad3..db6718a 100644 --- a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml @@ -140,7 +140,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/service/impl/OrderInfoServiceImpl.java b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/service/impl/OrderInfoServiceImpl.java index 0b90225..1043fa4 100644 --- a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/service/impl/OrderInfoServiceImpl.java +++ b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/service/impl/OrderInfoServiceImpl.java @@ -90,7 +90,7 @@ public class OrderInfoServiceImpl extends ServiceImpl - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml index 3cfdaf4..df5fe94 100644 --- a/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -141,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java index 82e4b1a..9375b0d 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; * @author yovinchen * @Create 2023/9/25 12:23 */ -@Api(tags = "团长接口") +@Api(tags = "配送员接口") @RestController @RequestMapping("api/user/leader") public class LeaderAddressController { diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java index e454c0d..24002ab 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java @@ -77,9 +77,9 @@ public class LoginWxService { userService.save(user); } - //5 根据userId查询提货点和团长信息 + //5 根据userId查询提货点和配送员信息 ////提货点 user表 user_delivery表 - ////团长 leader表 + ////配送员 leader表 LeaderAddressVo leaderAddressVo = userService.getLeaderAddressByUserId(user.getId()); //6 使用JWT工具根据userId和userName生成token字符串 diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java index 100dd72..7a98709 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java @@ -22,7 +22,7 @@ public interface UserService extends IService { User getUserByOpenId(String openid); /** - * 根据userId查询提货点和团长信息 + * 根据userId查询提货点和配送员信息 * * @param id * @return diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java index 0d41007..1326946 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java @@ -38,16 +38,16 @@ public class UserServiceImpl extends ServiceImpl implements Us return user; } - //5 根据userId查询提货点和团长信息 + //5 根据userId查询提货点和配送员信息 @Override public LeaderAddressVo getLeaderAddressByUserId(Long userId) { - //根据userId查询用户默认的团长id + //根据userId查询用户默认的配送员id UserDelivery userDelivery = userDeliveryMapper.selectOne(new LambdaQueryWrapper().eq(UserDelivery::getUserId, userId) .eq(UserDelivery::getIsDefault, 1)); if (userDelivery == null) { return null; } - //拿着上面查询团长id查询leader表查询团长其他信息 + //拿着上面查询配送员id查询leader表查询配送员其他信息 Leader leader = leaderMapper.selectById(userDelivery.getLeaderId()); //封装数据到LeaderAddressVo LeaderAddressVo leaderAddressVo = new LeaderAddressVo(); diff --git a/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml index bd22b04..78032f5 100644 --- a/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml @@ -85,7 +85,8 @@ - ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log + + ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -140,7 +141,7 @@ - udp:124.70.87.134 + udp:10.211.55.50 12201 1.1 diff --git a/xlcs-user/pages/my/my.vue b/xlcs-user/pages/my/my.vue index a6ad8a6..4cefbc9 100644 --- a/xlcs-user/pages/my/my.vue +++ b/xlcs-user/pages/my/my.vue @@ -78,7 +78,7 @@ - 邀新团长有奖 + 邀新配送员有奖 @@ -122,7 +122,7 @@ - 成为团长 + 成为配送员