From 673c73a3d34afffc35646be4868909ab9f8d02e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Mon, 15 Apr 2024 08:39:55 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=BA=9F=E5=93=81=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E5=8A=9F=E8=83=BDv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/common/utils/CommonUtil.java | 40 ++++++++++++++++++- .../controller/RecycleStationController.java | 15 ++++--- .../main/java/cc/yunxi/domain/po/Product.java | 4 ++ .../domain/vo/priceproduct/ProductRespVO.java | 12 +++++- .../service/impl/PriceProductServiceImpl.java | 4 ++ .../impl/RecycleStationServiceImpl.java | 15 ++++--- 6 files changed, 73 insertions(+), 17 deletions(-) diff --git a/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java b/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java index 07a37b2..e3f3445 100644 --- a/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java +++ b/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java @@ -14,8 +14,7 @@ import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Random; +import java.util.*; /** * 自定义全局函数 @@ -105,6 +104,43 @@ public class CommonUtil { return field.get(obj); } + /** + * 获取子节点 + * @param parentId + * @param dataList + * @return + */ + public static List getChildrenList(String parentId, List dataList) { + List voList = new ArrayList<>(); + dataList.forEach(v -> { + String pid = (String) obtainField(v, "parentId"); + if (Objects.equals(pid, parentId)) { + String id = (String) obtainField(v, "id"); + List children = getChildrenList(id, dataList); + assignField(v, "children", children); + voList.add(v); + } + }); + return voList; + } + + /** + * 获取父节点 + * @param thisId + * @param dataList + * @param parentList + */ + public static void getParent(String thisId, List dataList, List parentList) { + dataList.forEach(v -> { + String id = (String) obtainField(v, "id"); + if (Objects.equals(id, thisId)) { + parentList.add(v); + String pid = (String) obtainField(v, "parentId"); + getParent(pid, dataList, parentList); + } + }); + } + public static void main(String[] args) { // 121.190912 diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java index 9ca66b8..819f6b9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java @@ -58,8 +58,9 @@ public class RecycleStationController { }); List recycleStationRespVOList = recycleStationPageVO.getList(); recycleStationRespVOList.forEach(stationRespVO -> { - List produceList = recycleStationService.getStationProduct(stationRespVO.getId()); - stationRespVO.setStationProducts(produceList); + List productList = recycleStationService.getStationProduct(stationRespVO.getId()); + List productTreeList = CommonUtil.getChildrenList(null, productList); + stationRespVO.setStationProducts(productTreeList); }); // 性能优化 todo return CommonResult.success(recycleStationPageVO); } @@ -72,8 +73,9 @@ public class RecycleStationController { RecycleStationRespVO recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); if (ObjectUtil.isNotEmpty(station)) { recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); - List produceList = recycleStationService.getStationProduct(station.getId()); - recycleStationRespVO.setStationProducts(produceList); + List productList = recycleStationService.getStationProduct(station.getId()); + List productTreeList = CommonUtil.getChildrenList(null, productList); + recycleStationRespVO.setStationProducts(productTreeList); this.computeStationDistance(recycleStationRespVO, location); } return CommonResult.success(recycleStationRespVO); @@ -83,8 +85,9 @@ public class RecycleStationController { @ApiOperation("回收站废品价格类目") @GetMapping("/price-product") public CommonResult> stationProduct(@RequestParam("stationId") String stationId) { - List stationProduct = recycleStationService.getStationProduct(stationId); - return CommonResult.success(stationProduct); + List productList = recycleStationService.getStationProduct(stationId); + List productTreeList = CommonUtil.getChildrenList(null, productList); + return CommonResult.success(productTreeList); } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java index c2fb831..f7df347 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java @@ -28,6 +28,10 @@ public class Product { @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; + @ApiModelProperty("父id") + @TableField("parent_id") + private String parentId; + @ApiModelProperty("编码") @TableField("code") private String code; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java index e346542..41395fe 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java @@ -12,6 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; /** *

@@ -21,11 +22,14 @@ import java.util.Date; * @author ccongli * @since 2024-03-01 11:15:39 */ -@ApiModel(description = "回收站 Response VO") +@ApiModel(description = "类目 Response VO") @Data @Accessors(chain = true) public class ProductRespVO { + @ApiModelProperty("废品id") + private String id; + @ApiModelProperty("价格id") private String priceId; @@ -58,4 +62,10 @@ public class ProductRespVO { @ApiModelProperty("废品定价时间") private LocalDateTime creatorTime; + + @ApiModelProperty("父id") + private String parentId; + + @ApiModelProperty("子分类") + private List children; } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java index 03adb87..abde12b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java @@ -35,6 +35,7 @@ public class PriceProductServiceImpl extends ServiceImpl queryProductList() { LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); wrapperX.isNull(Product::getDeleted); + wrapperX.isNull(Product::getParentId); // 只查一级类目 return productMapper.selectList(wrapperX); } @@ -49,4 +50,7 @@ public class PriceProductServiceImpl extends ServiceImpl getStationProduct(String stationId) { QueryWrapper wrapper = new QueryWrapper().eq("a.status", GlobalStatusEnum.VALID); - String priceId = recycleStationPriceMapper.getLatestPriceByStationId(stationId,wrapper); + String priceId = recycleStationPriceMapper.getLatestPriceByStationId(stationId, wrapper); // if (ObjectUtil.isEmpty(priceId)) { // throw new BizIllegalException("回收站点未配置有效价目信息"); // } @@ -129,13 +129,12 @@ public class RecycleStationServiceImpl extends ServiceImpl Date: Tue, 16 Apr 2024 14:33:40 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=BA=9F=E5=93=81=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E5=8A=9F=E8=83=BDv2=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RecycleOrderController.java | 39 +++++++++---------- .../vo/recycleorder/RecycleOrderRespVO.java | 7 ---- .../dzorder/DZRecycleOrderRespVO.java | 4 +- .../shorder/RecycleOrderFinishVO.java | 3 +- .../shorder/SHRecycleOrderRespVO.java | 8 +--- .../tmorder/TMRecycleOrderRespVO.java | 4 +- ...eVO.java => RecycleOrderDetailRespVO.java} | 10 +---- .../service/IRecycleOrderProductService.java | 15 +++++++ .../impl/RecycleOrderProductServiceImpl.java | 14 +++++++ .../service/impl/RecycleOrderServiceImpl.java | 25 +++++++----- 10 files changed, 71 insertions(+), 58 deletions(-) rename nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/{RecycleOrderDetailResponseVO.java => RecycleOrderDetailRespVO.java} (71%) diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java index e198d17..c1d9d9f 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java @@ -12,6 +12,7 @@ import cc.yunxi.domain.dto.UserDTO; import cc.yunxi.domain.po.*; import cc.yunxi.domain.vo.clientaddress.ClientAddressSimpleVO; import cc.yunxi.domain.vo.housingestate.HousingEstateSimpleVO; +import cc.yunxi.domain.vo.priceproduct.ProductRespVO; import cc.yunxi.domain.vo.priceproduct.ProductSimpleVO; import cc.yunxi.domain.query.RecycleOrderQuery; import cc.yunxi.domain.vo.recycleorder.RecycleOrderRespVO; @@ -21,9 +22,8 @@ import cc.yunxi.domain.vo.recycleorder.shorder.*; import cc.yunxi.domain.vo.recycleorder.tmorder.TMRecycleOrderCreateVO; import cc.yunxi.domain.vo.recycleorder.tmorder.TMRecycleOrderFinishVO; import cc.yunxi.domain.vo.recycleorder.tmorder.TMRecycleOrderRespVO; -import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailResponseVO; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailRespVO; import cc.yunxi.domain.vo.recycler.RecyclerSimpleVO; -import cc.yunxi.domain.vo.recyclestation.RecycleStationRespVO; import cc.yunxi.domain.vo.recyclestation.RecycleStationSimpleVO; import cc.yunxi.enums.OrderTypeEnum; import cc.yunxi.enums.UserTypeEnum; @@ -138,22 +138,19 @@ public class RecycleOrderController { return CommonResult.success(CollUtils.getFirst(recycleOrderRespVO)); } - @ApiOperation("回收订单明细详情") + @ApiOperation("预约回收订单结算页") @GetMapping("/product-info") - public CommonResult> OrderProductList(@RequestParam("orderId") String orderId) { + public CommonResult> OrderProductList(@RequestParam("orderId") String orderId) { + RecycleOrder recycleOrder = recycleOrderService.getOrderById(orderId, false); + // 查询回收站下的所有类目信息 + String recycleStationId = recycleOrder.getRecycleStationId(); + List productList = recycleStationService.getStationProduct(recycleStationId); + List productTreeList = CommonUtil.getChildrenList(null, productList); + // 查询订单关联的一级类目信息 List orderProducts = recycleOrderProductService.getOrderProductsByOrderId(orderId); - List detailResponseVOList = BeanUtils.copyList(orderProducts, RecycleOrderDetailResponseVO.class); - Set productIds = detailResponseVOList.stream().map(RecycleOrderDetailResponseVO::getProductId).collect(Collectors.toSet()); - List productList = priceProductService.getProductListByIds(productIds); - if (CollUtils.isNotEmpty(productList)) { - Map productMap = productList.stream().collect(Collectors.toMap(Product::getId, p -> p, (k1, k2) -> k1)); - for (RecycleOrderDetailResponseVO detailVO : detailResponseVOList) { - Product product = productMap.get(detailVO.getProductId()); - detailVO.setProduct(BeanUtils.copyBean(product, ProductSimpleVO.class)); - } - } - // 是否展示最新价格? todo - return CommonResult.success(detailResponseVOList); + List categoryIdList = orderProducts.stream().map(RecycleOrderProduct::getProductId).collect(Collectors.toList()); + productTreeList = productTreeList.stream().filter(v -> categoryIdList.contains(v.getProductId())).collect(Collectors.toList()); + return CommonResult.success(productTreeList); } @@ -306,18 +303,18 @@ public class RecycleOrderController { private void assembleProductInfo(List orderRespVOList) { List orderIds = orderRespVOList.stream().map(RecycleOrderRespVO::getId).collect(Collectors.toList()); List orderProducts = recycleOrderProductService.getOrderProductsByOrderIds(orderIds); - List detailResponseVOList = BeanUtils.copyList(orderProducts, RecycleOrderDetailResponseVO.class); + List detailResponseVOList = BeanUtils.copyList(orderProducts, RecycleOrderDetailRespVO.class); // 查询废品信息 - Set productIds = detailResponseVOList.stream().map(RecycleOrderDetailResponseVO::getProductId).collect(Collectors.toSet()); + Set productIds = detailResponseVOList.stream().map(RecycleOrderDetailRespVO::getProductId).collect(Collectors.toSet()); List productList = priceProductService.getProductListByIds(productIds); if (CollUtils.isNotEmpty(productList)) { Map productMap = productList.stream().collect(Collectors.toMap(Product::getId, p -> p, (k1, k2) -> k1)); - for (RecycleOrderDetailResponseVO detailVO : detailResponseVOList) { + for (RecycleOrderDetailRespVO detailVO : detailResponseVOList) { Product product = productMap.get(detailVO.getProductId()); detailVO.setProduct(BeanUtils.copyBean(product, ProductSimpleVO.class)); } - Map> orderProductsMap = - detailResponseVOList.stream().collect(Collectors.groupingBy(RecycleOrderDetailResponseVO::getRecycleOrderId)); + Map> orderProductsMap = + detailResponseVOList.stream().collect(Collectors.groupingBy(RecycleOrderDetailRespVO::getRecycleOrderId)); orderRespVOList.forEach(v -> { CommonUtil.assignField(v, "orderDetails", orderProductsMap.get(v.getId())); }); diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java index 64a0d8f..4a42b21 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java @@ -1,20 +1,13 @@ package cc.yunxi.domain.vo.recycleorder; -import cc.yunxi.domain.dto.LocationDTO; -import cc.yunxi.domain.vo.clientaddress.ClientAddressSimpleVO; -import cc.yunxi.domain.vo.housingestate.HousingEstateSimpleVO; -import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailResponseVO; -import cc.yunxi.domain.vo.recycler.RecyclerSimpleVO; import cc.yunxi.enums.OrderStatusEnum; import cc.yunxi.enums.OrderTypeEnum; -import cc.yunxi.enums.ProductWeightEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.List; /** *

diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java index c3d9d46..5676b23 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java @@ -2,7 +2,7 @@ package cc.yunxi.domain.vo.recycleorder.dzorder; import cc.yunxi.domain.vo.recycleorder.RecycleOrderRespVO; -import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailResponseVO; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailRespVO; import cc.yunxi.domain.vo.recycler.RecyclerSimpleVO; import cc.yunxi.domain.vo.recyclestation.RecycleStationSimpleVO; import io.swagger.annotations.ApiModel; @@ -22,6 +22,6 @@ public class DZRecycleOrderRespVO extends RecycleOrderRespVO { private RecycleStationSimpleVO recycleStationInfo; @ApiModelProperty("订单明细详情") - private List orderDetails; + private List orderDetails; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java index f835ffd..913a0bd 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java @@ -1,6 +1,7 @@ package cc.yunxi.domain.vo.recycleorder.shorder; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailSaveVO; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailUpdateVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,5 +26,5 @@ public class RecycleOrderFinishVO { @ApiModelProperty(value = "订单明细", required = true) @NotNull(message = "订单明细未提交") @Valid - private List orderDetails; + private List orderDetails; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java index fc60507..d4d2dc1 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java @@ -2,19 +2,15 @@ package cc.yunxi.domain.vo.recycleorder.shorder; import cc.yunxi.domain.dto.LocationDTO; import cc.yunxi.domain.vo.clientaddress.ClientAddressSimpleVO; -import cc.yunxi.domain.vo.housingestate.HousingEstateSimpleVO; import cc.yunxi.domain.vo.recycleorder.RecycleOrderRespVO; -import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailResponseVO; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailRespVO; import cc.yunxi.domain.vo.recycler.RecyclerSimpleVO; import cc.yunxi.domain.vo.recyclestation.RecycleStationSimpleVO; -import cc.yunxi.enums.OrderStatusEnum; -import cc.yunxi.enums.OrderTypeEnum; import cc.yunxi.enums.ProductWeightEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -70,7 +66,7 @@ public class SHRecycleOrderRespVO extends RecycleOrderRespVO { private RecycleStationSimpleVO recycleStationInfo; @ApiModelProperty("订单明细详情") - private List orderDetails; + private List orderDetails; // @ApiModelProperty("综合评分") diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderRespVO.java index 95ff4b1..946a344 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderRespVO.java @@ -3,7 +3,7 @@ package cc.yunxi.domain.vo.recycleorder.tmorder; import cc.yunxi.domain.vo.housingestate.HousingEstateSimpleVO; import cc.yunxi.domain.vo.recycleorder.RecycleOrderRespVO; -import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailResponseVO; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailRespVO; import cc.yunxi.domain.vo.recycler.RecyclerSimpleVO; import cc.yunxi.domain.vo.recyclestation.RecycleStationSimpleVO; @@ -30,6 +30,6 @@ public class TMRecycleOrderRespVO extends RecycleOrderRespVO { private RecycleStationSimpleVO recycleStationInfo; @ApiModelProperty("订单明细详情") - private List orderDetails; + private List orderDetails; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailResponseVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailRespVO.java similarity index 71% rename from nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailResponseVO.java rename to nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailRespVO.java index 6e6bda2..7c4976a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailResponseVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailRespVO.java @@ -1,18 +1,10 @@ package cc.yunxi.domain.vo.recycleorderdetail; import cc.yunxi.domain.vo.priceproduct.ProductSimpleVO; -import cc.yunxi.enums.OrderStatusEnum; -import cc.yunxi.enums.OrderTypeEnum; -import cc.yunxi.enums.ProductWeightEnum; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -26,7 +18,7 @@ import java.time.LocalDateTime; */ @ApiModel(description = "回收订单明细 Response VO") @Data -public class RecycleOrderDetailResponseVO { +public class RecycleOrderDetailRespVO { @ApiModelProperty("主键id") private String id; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java index ca16168..60fc3de 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java @@ -64,4 +64,19 @@ public interface IRecycleOrderProductService extends IService recycleOrderProducts); + + + /** + * 订单废品一级类目批量添加 + * @param + * @return List + */ + void createOrderCategories(Collection recycleOrderCategories); + + /** + * 订单废品一级类目批量删除 + * @param + * @return orderId + */ + void deleteOrderCategories(String orderId); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java index 46734d3..a09f2d9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java @@ -67,4 +67,18 @@ public class RecycleOrderProductServiceImpl extends ServiceImpl recycleOrderProducts) { this.saveOrUpdateBatch(recycleOrderProducts); } + + + @Override + public void createOrderCategories(Collection recycleOrderProducts) { + this.saveBatch(recycleOrderProducts); + } + + + @Override + public void deleteOrderCategories(String orderId) { + LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX<>(); + wrapper.eq(RecycleOrderProduct::getRecycleOrderId, orderId); + this.remove(wrapper); + } } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index 9bebb9b..9205fdb 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -200,7 +200,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProductVOList = orderCreateVO.getOrderDetails(); recycleOrderProductVOList.forEach(rp -> { @@ -208,7 +208,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class); - this.recycleOrderProductService.createOrderProducts(recycleOrderProducts); + this.recycleOrderProductService.createOrderCategories(recycleOrderProducts); return orderId; } @@ -375,7 +375,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl 0) { // 大于0.1km + if (distance.compareTo(new BigDecimal("0.2")) > 0) { // 大于0.2km throw new BusinessLogicException("未到达!"); } recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class); @@ -390,7 +390,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProductVOList = orderFinishVO.getOrderDetails(); + // 删除一级类目信息 (订单详情不需要展示一级类目) + this.recycleOrderProductService.deleteOrderCategories(orderId); + // 保存订单明细信息 + List recycleOrderProductVOList = orderFinishVO.getOrderDetails(); + List recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class); LocalDateTime now = LocalDateTime.now(); String enterpriseId = recycleOrder.getCompanyId(); - recycleOrderProductVOList.forEach(rp -> { + recycleOrderProducts.forEach(rp -> { + rp.setRecycleOrderId(orderId); + rp.setCreatorTime(now); rp.setUpdateTime(now); PriceProduct latestPriceProduct = this.recycleOrderProductService.getLatestPriceProduct(rp.getProductId(), enterpriseId); log.info("latest price product: {}", latestPriceProduct); @@ -415,8 +421,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class); - this.recycleOrderProductService.updateOrderProducts(recycleOrderProducts); + this.recycleOrderProductService.saveOrderProducts(recycleOrderProducts); // 记录关键信息 String clientId = recycleOrder.getClientId(); @@ -460,7 +465,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProductVOList = tmOrderFinishVO.getOrderDetails(); List recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class); LocalDateTime now = LocalDateTime.now(); From fe6fbda46363e1f3f0882e0f4a346b7c278fb64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Tue, 16 Apr 2024 15:54:42 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=88=B0=E7=AB=99=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E5=9B=9E=E6=94=B6=E5=91=98=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index 9205fdb..d9ace03 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -253,7 +253,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl Date: Mon, 22 Apr 2024 17:59:42 +0800 Subject: [PATCH 04/13] =?UTF-8?q?review-list:=20=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=EF=BC=8C=E6=95=A3=E6=88=B7=E7=AB=AF=EF=BC=9B?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AB=AF=E7=A1=AE=E8=AE=A4=E5=9B=9E=E6=94=B6?= =?UTF-8?q?todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/common/utils/CommonUtil.java | 24 +++++++++++++- .../controller/RecycleStationController.java | 24 +++++++++++--- .../cc/yunxi/controller/TestController.java | 10 +++--- .../RecycleOrderDetailCreateVO.java | 6 ++-- .../mapper/RecycleStationPriceMapper.java | 21 ++++++++++++ .../yunxi/service/IRecycleStationService.java | 18 ++++++++++ .../impl/RecycleStationServiceImpl.java | 15 ++++++++- .../mapper/RecycleStationPriceMapper.xml | 33 +++++++++++++++++++ 8 files changed, 137 insertions(+), 14 deletions(-) diff --git a/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java b/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java index e3f3445..9239333 100644 --- a/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java +++ b/nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java @@ -111,12 +111,34 @@ public class CommonUtil { * @return */ public static List getChildrenList(String parentId, List dataList) { + List voList = new ArrayList<>(); + dataList.forEach(v -> { + if(v != null) { + String pid = (String) obtainField(v, "parentId"); + if (Objects.equals(pid, parentId)) { + String id = (String) obtainField(v, "id"); + List children = getChildrenList(id, dataList); + assignField(v, "children", children); + voList.add(v); + } + } + }); + return voList; + } + + /** + * 获取子节点 + * @param parentId + * @param dataList + * @return + */ + public static List getChildrenList2(String parentId, List dataList) { List voList = new ArrayList<>(); dataList.forEach(v -> { String pid = (String) obtainField(v, "parentId"); if (Objects.equals(pid, parentId)) { String id = (String) obtainField(v, "id"); - List children = getChildrenList(id, dataList); + List children = getChildrenList2(id, dataList); assignField(v, "children", children); voList.add(v); } diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java index 819f6b9..639a7b9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java @@ -66,6 +66,22 @@ public class RecycleStationController { } + @ApiOperation("回收站详情") + @GetMapping("/info2") + public CommonResult stationInfo2(@RequestParam("stationId") String stationId, @Valid LocationDTO location) { + RecycleStation station = recycleStationService.getStationById(stationId); + RecycleStationRespVO recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); + + if (ObjectUtil.isNotEmpty(station)) { + recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); + List productList = recycleStationService.getStationProduct(station.getId()); + List productTreeList = CommonUtil.getChildrenList(null, productList); + recycleStationRespVO.setStationProducts(productTreeList); + this.computeStationDistance(recycleStationRespVO, location); + } + return CommonResult.success(recycleStationRespVO); + } + @ApiOperation("回收站详情") @GetMapping("/info") public CommonResult stationInfo(@RequestParam("stationId") String stationId, @Valid LocationDTO location) { @@ -73,7 +89,7 @@ public class RecycleStationController { RecycleStationRespVO recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); if (ObjectUtil.isNotEmpty(station)) { recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class); - List productList = recycleStationService.getStationProduct(station.getId()); + List productList = recycleStationService.getStationProductAllByStationId(station.getId()); List productTreeList = CommonUtil.getChildrenList(null, productList); recycleStationRespVO.setStationProducts(productTreeList); this.computeStationDistance(recycleStationRespVO, location); @@ -85,12 +101,11 @@ public class RecycleStationController { @ApiOperation("回收站废品价格类目") @GetMapping("/price-product") public CommonResult> stationProduct(@RequestParam("stationId") String stationId) { - List productList = recycleStationService.getStationProduct(stationId); + List productList = recycleStationService.getStationProductAllByStationId(stationId); List productTreeList = CommonUtil.getChildrenList(null, productList); return CommonResult.success(productTreeList); } - @ApiOperation("附近的回收站") @GetMapping("/nearby") public CommonResult stationNearby(@Valid LocationDTO location) { @@ -98,7 +113,8 @@ public class RecycleStationController { RecycleStationRespVO stationRespVO = null; if (ObjectUtil.isNotEmpty(nearbyStation)) { stationRespVO = BeanUtils.copyBean(nearbyStation, RecycleStationRespVO.class); - List produceList = recycleStationService.getStationProduct(nearbyStation.getId()); + List produceList = recycleStationService.getStationProductFirstByStationId(nearbyStation.getId()); + stationRespVO.setStationProducts(produceList); this.computeStationDistance(stationRespVO, location); } diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/TestController.java b/nxhs-service/src/main/java/cc/yunxi/controller/TestController.java index 5111b66..35824f9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/TestController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/TestController.java @@ -9,8 +9,8 @@ import cc.yunxi.domain.dto.UserDTO; import cc.yunxi.domain.query.TestQuery; import cc.yunxi.enums.UserTypeEnum; import cc.yunxi.service.ITestService; -import cc.yunxi.test.AppConfig; -import cc.yunxi.test.dal.Animal; +//import cc.yunxi.test.AppConfig; +//import cc.yunxi.test.dal.Animal; import cc.yunxi.utils.JwtTool; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; @@ -71,9 +71,9 @@ public class TestController { @ApiOperation("测试接口成功") @GetMapping("/test01") public CommonResult success() { - Animal animal = SpringUtil.getBean("animalObj", Animal.class); - AppConfig appConfig = SpringUtil.getBean("appConfig", AppConfig.class); - log.info("animal bean: {}, appConfig bean: {}", animal, appConfig); +// Animal animal = SpringUtil.getBean("animalObj", Animal.class); +// AppConfig appConfig = SpringUtil.getBean("appConfig", AppConfig.class); +// log.info("animal bean: {}, appConfig bean: {}", animal, appConfig); return CommonResult.success("ok"); } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java index c944d93..b30d57a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java @@ -27,9 +27,9 @@ public class RecycleOrderDetailCreateVO { // @NotBlank(message = "商品名称不能为空") // private String productName; - @ApiModelProperty(value = "下单时回收单价", required = true) - @NotNull(message = "下单时回收单价不能为空") - @DecimalMin(value = "0.01", message = "下单时回收单价数值错误") + @ApiModelProperty(value = "下单时回收单价", required = false) +// @NotNull(message = "下单时回收单价不能为空") +// @DecimalMin(value = "0.01", message = "下单时回收单价数值错误") private BigDecimal recoveryPrice; @ApiModelProperty(value = "创建时间", hidden = true) diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/RecycleStationPriceMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/RecycleStationPriceMapper.java index 8fb7881..30aa3a9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/mapper/RecycleStationPriceMapper.java +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/RecycleStationPriceMapper.java @@ -4,6 +4,7 @@ import cc.yunxi.domain.po.Price; import cc.yunxi.domain.po.PriceProduct; import cc.yunxi.domain.po.RecycleStation; import cc.yunxi.domain.po.RecycleStationPrice; +import cc.yunxi.domain.vo.priceproduct.ProductRespVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 回收站价目关联 Mapper 接口 @@ -32,4 +35,22 @@ public interface RecycleStationPriceMapper extends BaseMapper wrapper); + /** + * 根据回收站id 查询一二级类目 + * @param stationId + * @return stationInfo + */ + List getStationInfoByStationId( + @Param("stationId") String stationId, + @Param(Constants.WRAPPER) Wrapper wrapper); + + /** + * 根据回收站id 查询一级类目 + * @param stationId + * @return stationInfo + */ + List getStationInfoFirstByStationId( + @Param("stationId") String stationId, + @Param(Constants.WRAPPER) Wrapper wrapper); + } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleStationService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleStationService.java index cadebd0..f7bf2c1 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleStationService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleStationService.java @@ -59,4 +59,22 @@ public interface IRecycleStationService extends IService { */ List getStationProduct(String stationId); + + /** + * 站点废品价目信息， 一二级全部信息 + * @param stationId + * @return RecycleOrder + */ + List getStationProductAllByStationId(String stationId); + + + /** + * 站点废品价目信息， 一级全部信息 + * @param stationId + * @return RecycleOrder + */ + List getStationProductFirstByStationId(String stationId); + + + } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java index a9933e7..cc301eb 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java @@ -106,7 +106,6 @@ public class RecycleStationServiceImpl extends ServiceImpl getStationProduct(String stationId) { QueryWrapper wrapper = new QueryWrapper().eq("a.status", GlobalStatusEnum.VALID); @@ -142,4 +141,18 @@ public class RecycleStationServiceImpl extends ServiceImpl getStationProductAllByStationId(String stationId) { + QueryWrapper wrapper = new QueryWrapper().eq("a.status", GlobalStatusEnum.VALID); + List res = recycleStationPriceMapper.getStationInfoByStationId(stationId, wrapper); + return res; + } + + @Override + public List getStationProductFirstByStationId(String stationId) { + QueryWrapper wrapper = new QueryWrapper().eq("a.status", GlobalStatusEnum.VALID); + List info = recycleStationPriceMapper.getStationInfoFirstByStationId(stationId, wrapper); + return info; + } + } diff --git a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml index 47d1e4a..060277b 100644 --- a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml +++ b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml @@ -22,4 +22,37 @@ LIMIT 1; + + + + + From 5b071299fc786d673e98af84a3cd7389316e2e9b Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Tue, 23 Apr 2024 13:14:15 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=88=86=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E9=A2=84=E7=BA=A6=E3=80=81=E5=88=B0=E7=AB=99=E3=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/controller/RecycleOrderController.java | 9 ++++++--- .../yunxi/controller/RecycleStationController.java | 3 +++ .../yunxi/service/impl/RecycleOrderServiceImpl.java | 12 ++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java index c1d9d9f..37d988a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java @@ -144,13 +144,16 @@ public class RecycleOrderController { RecycleOrder recycleOrder = recycleOrderService.getOrderById(orderId, false); // 查询回收站下的所有类目信息 String recycleStationId = recycleOrder.getRecycleStationId(); - List productList = recycleStationService.getStationProduct(recycleStationId); + List productList = recycleStationService.getStationProductAllByStationId(recycleStationId); List productTreeList = CommonUtil.getChildrenList(null, productList); - // 查询订单关联的一级类目信息 + +// // 查询订单关联的二级类目信息 List orderProducts = recycleOrderProductService.getOrderProductsByOrderId(orderId); List categoryIdList = orderProducts.stream().map(RecycleOrderProduct::getProductId).collect(Collectors.toList()); - productTreeList = productTreeList.stream().filter(v -> categoryIdList.contains(v.getProductId())).collect(Collectors.toList()); + + productTreeList = productTreeList.stream().filter(v -> categoryIdList.contains(v.getId())).collect(Collectors.toList()); return CommonResult.success(productTreeList); + } diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java index 639a7b9..5a39964 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java @@ -103,6 +103,9 @@ public class RecycleStationController { public CommonResult> stationProduct(@RequestParam("stationId") String stationId) { List productList = recycleStationService.getStationProductAllByStationId(stationId); List productTreeList = CommonUtil.getChildrenList(null, productList); + for(ProductRespVO item : productTreeList) { + item.setProductId(item.getId()); + } return CommonResult.success(productTreeList); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index d9ace03..9099413 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -288,8 +288,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl Date: Tue, 23 Apr 2024 16:20:42 +0800 Subject: [PATCH 06/13] 300m --- log.path_IS_UNDEFINED/log_debug.log | 0 log.path_IS_UNDEFINED/log_error.log | 0 log.path_IS_UNDEFINED/log_info.log | 2 ++ log.path_IS_UNDEFINED/log_warn.log | 0 .../java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java | 2 +- 5 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 log.path_IS_UNDEFINED/log_debug.log create mode 100644 log.path_IS_UNDEFINED/log_error.log create mode 100644 log.path_IS_UNDEFINED/log_info.log create mode 100644 log.path_IS_UNDEFINED/log_warn.log diff --git a/log.path_IS_UNDEFINED/log_debug.log b/log.path_IS_UNDEFINED/log_debug.log new file mode 100644 index 0000000..e69de29 diff --git a/log.path_IS_UNDEFINED/log_error.log b/log.path_IS_UNDEFINED/log_error.log new file mode 100644 index 0000000..e69de29 diff --git a/log.path_IS_UNDEFINED/log_info.log b/log.path_IS_UNDEFINED/log_info.log new file mode 100644 index 0000000..6dc77b2 --- /dev/null +++ b/log.path_IS_UNDEFINED/log_info.log @@ -0,0 +1,2 @@ +2024-04-23 13:37:36.665 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated... +2024-04-23 13:37:36.716 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed. diff --git a/log.path_IS_UNDEFINED/log_warn.log b/log.path_IS_UNDEFINED/log_warn.log new file mode 100644 index 0000000..e69de29 diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index 9099413..a0ddf11 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -377,7 +377,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl 0) { // 大于0.2km + if (distance.compareTo(new BigDecimal("0.3")) > 0) { // 大于0.2km throw new BusinessLogicException("未到达!"); } recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class); From 5cf14d31b118d8cfaeb68696529042e40b4f3563 Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Wed, 24 Apr 2024 17:44:36 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=AE=A2=E5=8D=95todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/yunxi/controller/CommonController.java | 1 + .../src/main/java/cc/yunxi/domain/dto/UserDTO.java | 4 ++++ .../main/java/cc/yunxi/domain/po/RecycleOrder.java | 4 ++++ .../cc/yunxi/domain/vo/client/ClientRespVO.java | 7 +++++++ .../dzorder/DZRecycleOrderCreateVO.java | 4 ++++ .../recycleorder/shorder/RecycleOrderCreateVO.java | 6 ++++++ .../main/java/cc/yunxi/mapper/ClientMapper.java | 2 +- .../main/java/cc/yunxi/service/IClientService.java | 7 +++++++ .../cc/yunxi/service/impl/ClientServiceImpl.java | 14 ++++++++++++++ .../java/cc/yunxi/service/impl/CommonService.java | 3 +++ .../service/impl/RecycleOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/ClientMapper.xml | 5 +++++ 12 files changed, 57 insertions(+), 2 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java b/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java index 9d04265..001ce42 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java @@ -36,6 +36,7 @@ public class CommonController { public CommonResult shLogin(@RequestBody WxLoginDTO wxLoginDTO) { // 散户端登录业务 UserDTO userDTO = commonService.loginByClient(wxLoginDTO); + return CommonResult.success(userDTO); } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java index 25a1ecb..54d814b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java @@ -1,6 +1,7 @@ package cc.yunxi.domain.dto; import cc.yunxi.enums.UserTypeEnum; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,4 +37,7 @@ public class UserDTO { @ApiModelProperty(value = "访问token", required = false) private String token; // 返回时有用 + @ApiModelProperty(value = "是否单位散户", required = false) + private String isClientUnit; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java index 865093d..7e71c0a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java @@ -151,6 +151,10 @@ public class RecycleOrder { @TableField("organize_json_id") private String organizeJsonId; + @ApiModelProperty("订单的散户类型，1非单位订单，2单位订单") + @TableField("client_type") + private Integer clientType; + // @ApiModelProperty("综合评分") // @TableField("star_score") // private Integer starScore; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java index ab83583..fcf457a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java @@ -1,5 +1,6 @@ package cc.yunxi.domain.vo.client; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -81,4 +82,10 @@ public class ClientRespVO { @ApiModelProperty("创建时间") private LocalDateTime creatorTime; + @ApiModelProperty("是否有单位(0-无单位，1-有单位)") + private Integer clientType; + + @ApiModelProperty("所属单位名称") + private String clientUnitName; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java index a1443ee..c19fe5d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java @@ -2,6 +2,7 @@ package cc.yunxi.domain.vo.recycleorder.dzorder; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailSaveVO; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailUpdateVO; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,9 @@ public class DZRecycleOrderCreateVO { @Valid private List orderDetails; + @ApiModelProperty(value = "订单的散户类型，1非单位，2单位订单", required = true, example = "1") + private String clientType; + @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门") private String remark; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java index e894f6d..f3dc867 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java @@ -62,4 +62,10 @@ public class RecycleOrderCreateVO { @Valid private List orderDetails; + @ApiModelProperty(value = "单位订单", required = true) + @NotNull(message = "是否单位订单") + @Valid + private Integer clientType; + + } diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java index 9e9e026..1b829ea 100644 --- a/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java @@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ClientMapper extends BaseMapper { - + String isClientUnit(String phoneNumber); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java index d03ff12..7b3976b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java @@ -69,6 +69,13 @@ public interface IClientService extends IService { */ Client registerClient(String phoneNumber, String openId); + /** + * 根据手机号注册散户信息 + * @param phoneNumber + * @param openId + * @return Client + */ + String isClientUnit(String phoneNumber); /** * 更新散户信息 diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java index 929cbae..e841114 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java @@ -79,6 +79,10 @@ public class ClientServiceImpl extends ServiceImpl impleme @Resource private WxPayV3Properties wxPayV3Properties; + @Resource + private ClientMapper clientMapper; + + private String serialNo; private final static int OK = 200; @@ -148,6 +152,16 @@ public class ClientServiceImpl extends ServiceImpl impleme return client; } + @Override + public String isClientUnit(String phoneNumber) { + String id = clientMapper.isClientUnit(phoneNumber); + if (id == null) { + return "n"; + } else { + return "y"; + } + } + @Override @Transactional diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java index ad18317..5a4fa1e 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java @@ -130,6 +130,9 @@ public class CommonService implements ICommonService { userDTO.setUserType(UserTypeEnum.CLIENT); userDTO.setUsername(client.getNickName()); userDTO.setToken(this.createToken(userDTO)); + +// userDTO.setIsClientUnit( clientService.isClientUnit(userDTO.getPhone())); + return userDTO; } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index a0ddf11..dfb44c6 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -377,7 +377,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl 0) { // 大于0.2km + if (distance.compareTo(new BigDecimal("0.3")) > 0) { // 大于0.3km throw new BusinessLogicException("未到达!"); } recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class); diff --git a/nxhs-service/src/main/resources/mapper/ClientMapper.xml b/nxhs-service/src/main/resources/mapper/ClientMapper.xml index 807c4a4..9e1eb86 100644 --- a/nxhs-service/src/main/resources/mapper/ClientMapper.xml +++ b/nxhs-service/src/main/resources/mapper/ClientMapper.xml @@ -2,4 +2,9 @@ + + + From ce4fa3523bc30f9171602fd3bf2ade64344c1e1b Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Wed, 24 Apr 2024 17:58:37 +0800 Subject: [PATCH 08/13] no message --- .../vo/recycleorder/shorder/RecycleOrderCreateVO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java index f3dc867..85d6062 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java @@ -62,10 +62,10 @@ public class RecycleOrderCreateVO { @Valid private List orderDetails; - @ApiModelProperty(value = "单位订单", required = true) - @NotNull(message = "是否单位订单") - @Valid - private Integer clientType; +// @ApiModelProperty(value = "单位订单", required = true) +// @NotNull(message = "是否单位订单") +// @Valid +// private Integer clientType; } From 3b1b64de0917e129242badf8ec55b4ab469c92cd Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 25 Apr 2024 13:19:18 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E5=85=85=E5=80=BC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加充值功能及充值列表接口 --- .../controller/EnterpriseController.java | 56 ++++++++++- .../cc/yunxi/domain/po/EnterpriseWallet.java | 99 +++++++++++++++++++ .../cc/yunxi/domain/query/WalletQuery.java | 19 ++++ .../yunxi/domain/vo/enterprise/WalletVO.java | 65 ++++++++++++ .../java/cc/yunxi/mapper/WalletMapper.java | 21 ++++ .../cc/yunxi/service/IEnterpriseService.java | 7 ++ .../service/IEnterpriseWalletService.java | 28 ++++++ .../service/impl/EnterpriseServiceImpl.java | 14 ++- .../impl/EnterpriseWalletServiceImpl.java | 88 +++++++++++++++++ .../main/resources/mapper/WalletMapper.xml | 11 +++ 10 files changed, 403 insertions(+), 5 deletions(-) create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java create mode 100644 nxhs-service/src/main/resources/mapper/WalletMapper.xml diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java b/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java index 397bfda..8b3003a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java @@ -1,9 +1,27 @@ package cc.yunxi.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import cc.yunxi.aspect.UserTypeAnnotation; +import cc.yunxi.common.domain.CommonResult; +import cc.yunxi.common.domain.PageDTO; +import cc.yunxi.domain.dto.UserDTO; +import cc.yunxi.domain.po.Client; +import cc.yunxi.domain.po.EnterpriseWallet; +import cc.yunxi.domain.query.ClientQuery; +import cc.yunxi.domain.query.WalletQuery; +import cc.yunxi.domain.vo.client.ClientRespVO; +import cc.yunxi.domain.vo.enterprise.WalletVO; +import cc.yunxi.enums.UserTypeEnum; +import cc.yunxi.service.IClientService; +import cc.yunxi.service.IEnterpriseService; +import cc.yunxi.service.IEnterpriseWalletService; +import cc.yunxi.utils.UserContext; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; /** *

@@ -13,8 +31,42 @@ import org.springframework.web.bind.annotation.RestController; * @author ccongli * @since 2024-03-10 09:04:53 */ +@Api(tags = "机构用户接口") @RestController @RequestMapping("/enterprise") +@RequiredArgsConstructor +@UserTypeAnnotation(UserTypeEnum.RECYCLER) public class EnterpriseController { + private final IEnterpriseWalletService enterpriseWalletService; + + + @ApiOperation("是否是商户用户，是则返回y，否则返回n") + @PostMapping("/is-org-user") + public CommonResult isOrgUser(@RequestParam("phone") String phone) { + + String result = enterpriseWalletService.isOrgUser(phone); + + return CommonResult.success(result); + } + + @ApiOperation("商户充值") + @PostMapping("/add-wallet") + public CommonResult addWallet(@RequestBody WalletVO walletVO) { + UserDTO userDTO = UserContext.getUser(); + String result = enterpriseWalletService.addWallet(walletVO); + + return CommonResult.success(true); + } + + @ApiOperation("商户充值列表") + @PostMapping("/list-wallet") + public CommonResult> getWallets(@RequestBody WalletQuery walletQuery) { + // 1.分页查询 + Page result = enterpriseWalletService.queryWalletByPage(walletQuery); + // 2.封装并返回 + PageDTO walletPageVO = PageDTO.of(result, WalletVO.class); + + return CommonResult.success(walletPageVO); + } } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java new file mode 100644 index 0000000..4665f2e --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java @@ -0,0 +1,99 @@ +package cc.yunxi.domain.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * 企业(商户)信息 + *

+ * + * @author ccongli + * @since 2024-03-10 09:04:53 + */ +@Data +@TableName("base_wallet") +@ApiModel(value = "Enterprise钱包流水对象", description = "钱包流水对象") +public class EnterpriseWallet { + + @ApiModelProperty("流水id") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + @ApiModelProperty("商户pid") + @TableField(value = "buiness_id") + private String buinessId; + + @ApiModelProperty("流水编号") + @TableField("code") + private String code; + + @ApiModelProperty("订单编号") + @TableField("order_code") + private String orderCode; + + @ApiModelProperty("类型(1：充值订单 2：提款订单)") + @TableField("wallet_type") + private String walletType; + + @ApiModelProperty("申请时间") + @TableField("apply_time") + private LocalDateTime applyTime; + + @ApiModelProperty("备注") + @TableField("description") + private String description; + + @ApiModelProperty("费用项目(1：预存款)") + @TableField("expense_type") + private String expenseType; + + @ApiModelProperty("单据状态(1：未入账 2：已出账)") + @TableField("order_status") + private String orderStatus; + + @ApiModelProperty("充值状态(1：未充值 2：已充值)") + @TableField("recharge_status") + private String rechargeStatus; + + @ApiModelProperty("金额") + @TableField("price_star") + private BigDecimal price_star; + + @ApiModelProperty("上传凭证图片") + @TableField("photo") + private String photo; + + @ApiModelProperty("上传附件") + @TableField("file") + private String file; + + @ApiModelProperty("公司id") + @TableField("company_id") + private String companyId; + + @ApiModelProperty("组织id") + @TableField("organize_json_id") + private String organizeJsonId; + + + + @ApiModelProperty("创建时间") + @TableField("f_creator_time") + private LocalDateTime creatorTime; + + @ApiModelProperty("修改时间") + @TableField("f_last_modify_time") + private Date fLastModifyTime; + + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java b/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java new file mode 100644 index 0000000..a18031e --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java @@ -0,0 +1,19 @@ +package cc.yunxi.domain.query; + +import cc.yunxi.common.domain.PageQuery; +import cc.yunxi.domain.po.Client; +import cc.yunxi.domain.po.EnterpriseWallet; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "WalletQuery", description = "充值查询条件") +public class WalletQuery extends PageQuery { + + @ApiModelProperty("联系电话") + private String mobilePhone; + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java new file mode 100644 index 0000000..c815f9e --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java @@ -0,0 +1,65 @@ +package cc.yunxi.domain.vo.enterprise; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@ApiModel(description = "商户余额充值 Request VO") +@Data +public class WalletVO { + + @ApiModelProperty("流水id") + private String id; + + @ApiModelProperty("商户pid") + private String buinessId; + + @ApiModelProperty("流水编号") + private String code; + + @ApiModelProperty("订单编号") + private String orderCode; + + @ApiModelProperty("类型(1：充值订单 2：提款订单)") + private String walletType; + + @ApiModelProperty("申请时间") + private LocalDateTime applyTime; + + @ApiModelProperty("备注") + private String description; + + @ApiModelProperty("费用项目(1：预存款)") + private String expenseType; + + @ApiModelProperty("单据状态(1：未入账 2：已出账)") + private String orderStatus; + + @ApiModelProperty("充值状态(1：未充值 2：已充值)") + private String rechargeStatus; + + @ApiModelProperty("金额") + private BigDecimal price_star; + + @ApiModelProperty("上传凭证图片") + private String photo; + + @ApiModelProperty("上传附件") + private String file; + + @ApiModelProperty("公司id") + private String companyId; + + @ApiModelProperty("组织id") + private String organizeJsonId; +} diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java new file mode 100644 index 0000000..1297ce2 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java @@ -0,0 +1,21 @@ +package cc.yunxi.mapper; + +import cc.yunxi.domain.po.Enterprise; +import cc.yunxi.domain.po.EnterpriseWallet; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 钱包流水(商户)信息 Mapper 接口 + *

+ * + * @author ccongli + * @since 2024-03-10 09:04:53 + */ +@Mapper +public interface WalletMapper extends BaseMapper { + + String queryOrgUserByPhone(String Phone); + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java index 61acbec..4818323 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java @@ -1,6 +1,10 @@ package cc.yunxi.service; import cc.yunxi.domain.po.Enterprise; +import cc.yunxi.domain.po.EnterpriseWallet; +import cc.yunxi.domain.query.WalletQuery; +import cc.yunxi.domain.vo.enterprise.WalletVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -34,4 +38,7 @@ public interface IEnterpriseService extends IService { * @param amount */ void rechargeBalance(String merchantId, Integer amount); + + + } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java new file mode 100644 index 0000000..e5bcdcb --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java @@ -0,0 +1,28 @@ +package cc.yunxi.service; + +import cc.yunxi.domain.po.Enterprise; +import cc.yunxi.domain.po.EnterpriseWallet; +import cc.yunxi.domain.query.WalletQuery; +import cc.yunxi.domain.vo.enterprise.WalletVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 企业(商户)钱包信息 服务类 + *

+ * + * @author ccongli + * @since 2024-03-10 09:04:53 + */ +public interface IEnterpriseWalletService extends IService { + + + String isOrgUser(String phone); + + String addWallet(WalletVO walletVO); + + Page queryWalletByPage(WalletQuery walletQuery); + + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java index 8de573d..1164dc7 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java @@ -1,23 +1,29 @@ package cc.yunxi.service.impl; +import cc.yunxi.common.domain.LambdaQueryWrapperX; import cc.yunxi.common.exception.BizIllegalException; +import cc.yunxi.common.utils.BeanUtils; import cc.yunxi.common.utils.CommonUtil; -import cc.yunxi.domain.po.Enterprise; -import cc.yunxi.domain.po.EnterpriseAccountBill; -import cc.yunxi.domain.po.RecycleStation; +import cc.yunxi.domain.po.*; +import cc.yunxi.domain.query.WalletQuery; +import cc.yunxi.domain.vo.client.ClientRespVO; +import cc.yunxi.domain.vo.enterprise.WalletVO; import cc.yunxi.enums.BusinessCodeEnum; import cc.yunxi.enums.GlobalStatusEnum; import cc.yunxi.mapper.EnterpriseAccountBillMapper; import cc.yunxi.mapper.EnterpriseMapper; +import cc.yunxi.mapper.WalletMapper; import cc.yunxi.service.IEnterpriseService; import cc.yunxi.service.IRecycleStationService; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -41,6 +47,8 @@ public class EnterpriseServiceImpl extends ServiceImpl + * 企业(商户)信息 服务实现类 + *

+ * + * @author ccongli + * @since 2024-03-10 09:04:53 + */ +@Service +public class EnterpriseWalletServiceImpl extends ServiceImpl implements IEnterpriseWalletService { + + @Autowired + private WalletMapper walletMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public String isOrgUser(String phone) { + + // 返回内容 + String result= "n"; + String orgUserId = walletMapper.queryOrgUserByPhone(phone); + + // 根据移动电话查找商户用户信息，有则返回y，无则返回n + if(orgUserId != null){ + result= "y"; + } + + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public String addWallet(WalletVO walletVO) { + EnterpriseWallet enterpriseWallet = BeanUtils.copyBean(walletVO, EnterpriseWallet.class); + // 返回内容 + + walletMapper.insert(enterpriseWallet); + + return enterpriseWallet.getId(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Page queryWalletByPage(WalletQuery walletQuery){ + + LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); + wrapperX.eqIfPresent(EnterpriseWallet::getPhoto, walletQuery.getMobilePhone()); + + Page pageDO = walletQuery.buildPage(); + return this.page(pageDO, wrapperX); + + } + +} diff --git a/nxhs-service/src/main/resources/mapper/WalletMapper.xml b/nxhs-service/src/main/resources/mapper/WalletMapper.xml new file mode 100644 index 0000000..b6c2814 --- /dev/null +++ b/nxhs-service/src/main/resources/mapper/WalletMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + + From 9a5037cc1ba351fba15770ebcbb76fcb4fea83d0 Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Thu, 25 Apr 2024 14:26:27 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E7=8A=B6=E6=80=81=E4=B8=8D=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java index abde12b..682df8b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java @@ -46,7 +46,6 @@ public class PriceProductServiceImpl extends ServiceImpl Date: Thu, 25 Apr 2024 19:05:36 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/log-debug-2024-04-24_11-10.0.log | 0 .../debug/log-debug-2024-04-25_17-41.0.log | 117 ++++++++++ .../debug/log-debug-2024-04-25_17-47.0.log | 108 ++++++++++ .../error/log-error-2024-04-24.0.log | 0 .../info/log-info-2024-04-24.0.log | 2 + log.path_IS_UNDEFINED/log_debug.log | 105 +++++++++ log.path_IS_UNDEFINED/log_error.log | 199 ++++++++++++++++++ log.path_IS_UNDEFINED/log_info.log | 66 +++++- log.path_IS_UNDEFINED/log_warn.log | 30 +++ .../warn/log-warn-2024-04-24.0.log | 0 .../controller/EnterpriseController.java | 6 +- .../java/cc/yunxi/mapper/WalletMapper.java | 5 +- .../service/IEnterpriseWalletService.java | 2 +- .../impl/EnterpriseWalletServiceImpl.java | 6 +- .../main/resources/mapper/WalletMapper.xml | 6 +- 15 files changed, 637 insertions(+), 15 deletions(-) create mode 100644 log.path_IS_UNDEFINED/debug/log-debug-2024-04-24_11-10.0.log create mode 100644 log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-41.0.log create mode 100644 log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-47.0.log create mode 100644 log.path_IS_UNDEFINED/error/log-error-2024-04-24.0.log create mode 100644 log.path_IS_UNDEFINED/info/log-info-2024-04-24.0.log create mode 100644 log.path_IS_UNDEFINED/warn/log-warn-2024-04-24.0.log diff --git a/log.path_IS_UNDEFINED/debug/log-debug-2024-04-24_11-10.0.log b/log.path_IS_UNDEFINED/debug/log-debug-2024-04-24_11-10.0.log new file mode 100644 index 0000000..e69de29 diff --git a/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-41.0.log b/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-41.0.log new file mode 100644 index 0000000..a094904 --- /dev/null +++ b/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-41.0.log @@ -0,0 +1,117 @@ +2024-04-25 17:41:44.853 [http-nio-8808-exec-3] DEBUG cc.yunxi.mapper.RecyclerMapper.selectOne - ==> Preparing: SELECT id,station_id,staffs_name,mobile_phone,head_icon,gender,recycle_miles,order_total,good_total,order_amount,auto_enabled,enabled_mark AS status,openid,company_id FROM nx_recycle_station_staff WHERE (mobile_phone = ?) limit 1 +2024-04-25 17:41:44.859 [http-nio-8808-exec-3] DEBUG cc.yunxi.mapper.RecyclerMapper.selectOne - ==> Parameters: 13601921745(String) +2024-04-25 17:41:44.954 [http-nio-8808-exec-3] DEBUG cc.yunxi.mapper.RecyclerMapper.selectOne - <== Total: 1 +2024-04-25 17:41:45.325 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.WalletMapper.queryOrgUserByPhone - ==> Preparing: SELECT f_id FROM base_user where f_mobile_phone=? LIMIT 1; +2024-04-25 17:41:45.328 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.WalletMapper.queryOrgUserByPhone - ==> Parameters: 13601921745(String) +2024-04-25 17:41:45.412 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.WalletMapper.queryOrgUserByPhone - <== Total: 0 +2024-04-25 17:41:51.195 [http-nio-8808-exec-6] DEBUG c.y.m.R.getStationInfoByStationId - ==> Preparing: select id,name,photo,parent_id, 0 recovery_price from nx_product as f where exists( select e.parent_id from nx_enterprise_recycle_station as a left join nx_price_recycle as b on a.id=b.recycle_id left join nx_price_product as c on b.price_id= c.price_id left join nx_price as d on d.id=b.price_id left join nx_product as e on e.id=c.product_id where a.id=? and e.parent_id=f.id ) union all select e.id,e.name,e.photo,e.parent_id, c.recovery_price from nx_enterprise_recycle_station as a left join nx_price_recycle as b on a.id=b.recycle_id left join nx_price_product as c on b.price_id= c.price_id left join nx_price as d on d.id=b.price_id left join nx_product as e on e.id=c.product_id where a.id=? +2024-04-25 17:41:51.196 [http-nio-8808-exec-6] DEBUG c.y.m.R.getStationInfoByStationId - ==> Parameters: 552044082721986181(String), 552044082721986181(String) +2024-04-25 17:41:51.289 [http-nio-8808-exec-5] DEBUG cc.yunxi.common.advice.CommonExceptionAdvice - +org.springframework.web.util.NestedServletException: Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1086) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:964) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) + at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:696) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:779) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at cc.yunxi.filter.HttpServletRequestReplacedFilter.doFilter(HttpServletRequestReplacedFilter.java:28) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:96) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:177) + at org.apache.catalina.core.StandardContextValve.__invoke(StandardContextValve.java:97) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:41002) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:891) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1784) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) + at java.lang.Thread.run(Thread.java:748) +Caused by: java.lang.BootstrapMethodError: call site initialization exception + at java.lang.invoke.CallSite.makeSite(CallSite.java:341) + at java.lang.invoke.MethodHandleNatives.linkCallSiteImpl(MethodHandleNatives.java:307) + at java.lang.invoke.MethodHandleNatives.linkCallSite(MethodHandleNatives.java:297) + at cc.yunxi.service.impl.RecycleOrderServiceImpl.queryOrderByPage(RecycleOrderServiceImpl.java:134) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$FastClassBySpringCGLIB$$1.invoke() + at sun.reflect.GeneratedMethodAccessor238.invoke(Unknown Source) + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.validation.beanvalidation.MethodValidationInterceptor.invoke(MethodValidationInterceptor.java:123) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController.queryOrderByPage(RecycleOrderController.java:85) + at cc.yunxi.controller.RecycleOrderController$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at sun.reflect.GeneratedMethodAccessor191.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1071) + ... 51 common frames omitted +Caused by: java.lang.ClassCastException: Cannot cast cc.yunxi.service.impl.RecycleOrderServiceImpl$$Lambda$1907/380591562 to cc.yunxi.common.domain.function.SFunction + at java.lang.Class.cast(Class.java:3369) + at com.zeroturnaround.jrebelbase.facade.ad.a(SourceFile:89) + at com.zeroturnaround.jrebelbase.facade.ad.cast(SourceFile:51) + at java.lang.invoke.MethodHandle.bindTo(MethodHandle.java:1276) + at java.lang.invoke.MethodHandles.constant(MethodHandles.java:2279) + at java.lang.invoke.InnerClassLambdaMetafactory.buildCallSite(InnerClassLambdaMetafactory.java:216) + at java.lang.invoke.LambdaMetafactory.altMetafactory(LambdaMetafactory.java:474) + at com.zeroturnaround.jrebelbase.facade.at.altMetafactory(SourceFile:56) + at java.lang.invoke.CallSite.makeSite(CallSite.java:314) + ... 85 common frames omitted +2024-04-25 17:41:51.387 [http-nio-8808-exec-6] DEBUG c.y.m.R.getStationInfoByStationId - <== Total: 17 +2024-04-25 17:41:52.687 [http-nio-8808-exec-6] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Preparing: SELECT id,station_id,staffs_name,mobile_phone,head_icon,gender,recycle_miles,order_total,good_total,order_amount,auto_enabled,enabled_mark AS status,openid,company_id FROM nx_recycle_station_staff WHERE id=? +2024-04-25 17:41:52.688 [http-nio-8808-exec-6] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Parameters: 552131464246859397(String) +2024-04-25 17:41:52.698 [http-nio-8808-exec-6] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - <== Total: 1 +2024-04-25 17:41:57.527 [http-nio-8808-exec-2] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Preparing: SELECT id,station_id,staffs_name,mobile_phone,head_icon,gender,recycle_miles,order_total,good_total,order_amount,auto_enabled,enabled_mark AS status,openid,company_id FROM nx_recycle_station_staff WHERE id=? +2024-04-25 17:41:57.528 [http-nio-8808-exec-2] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Parameters: 552131464246859397(String) +2024-04-25 17:41:57.536 [http-nio-8808-exec-2] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - <== Total: 1 diff --git a/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-47.0.log b/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-47.0.log new file mode 100644 index 0000000..f6da533 --- /dev/null +++ b/log.path_IS_UNDEFINED/debug/log-debug-2024-04-25_17-47.0.log @@ -0,0 +1,108 @@ +2024-04-25 17:47:27.912 [http-nio-8808-exec-3] DEBUG cc.yunxi.common.advice.CommonExceptionAdvice - +org.springframework.web.util.NestedServletException: Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1086) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:964) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) + at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:696) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:779) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at cc.yunxi.filter.HttpServletRequestReplacedFilter.doFilter(HttpServletRequestReplacedFilter.java:28) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:96) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:177) + at org.apache.catalina.core.StandardContextValve.__invoke(StandardContextValve.java:97) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:41002) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:891) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1784) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) + at java.lang.Thread.run(Thread.java:748) +Caused by: java.lang.BootstrapMethodError: call site initialization exception + at java.lang.invoke.CallSite.makeSite(CallSite.java:341) + at java.lang.invoke.MethodHandleNatives.linkCallSiteImpl(MethodHandleNatives.java:307) + at java.lang.invoke.MethodHandleNatives.linkCallSite(MethodHandleNatives.java:297) + at cc.yunxi.service.impl.RecycleOrderServiceImpl.queryOrderByPage(RecycleOrderServiceImpl.java:134) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$FastClassBySpringCGLIB$$1.invoke() + at sun.reflect.GeneratedMethodAccessor238.invoke(Unknown Source) + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.validation.beanvalidation.MethodValidationInterceptor.invoke(MethodValidationInterceptor.java:123) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController.queryOrderByPage(RecycleOrderController.java:85) + at cc.yunxi.controller.RecycleOrderController$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at sun.reflect.GeneratedMethodAccessor191.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1071) + ... 51 common frames omitted +Caused by: java.lang.ClassCastException: Cannot cast cc.yunxi.service.impl.RecycleOrderServiceImpl$$Lambda$1908/669903827 to cc.yunxi.common.domain.function.SFunction + at java.lang.Class.cast(Class.java:3369) + at com.zeroturnaround.jrebelbase.facade.ad.a(SourceFile:89) + at com.zeroturnaround.jrebelbase.facade.ad.cast(SourceFile:51) + at java.lang.invoke.MethodHandle.bindTo(MethodHandle.java:1276) + at java.lang.invoke.MethodHandles.constant(MethodHandles.java:2279) + at java.lang.invoke.InnerClassLambdaMetafactory.buildCallSite(InnerClassLambdaMetafactory.java:216) + at java.lang.invoke.LambdaMetafactory.altMetafactory(LambdaMetafactory.java:474) + at com.zeroturnaround.jrebelbase.facade.at.altMetafactory(SourceFile:56) + at java.lang.invoke.CallSite.makeSite(CallSite.java:314) + ... 85 common frames omitted +2024-04-25 17:47:31.221 [http-nio-8808-exec-9] DEBUG c.y.m.R.getStationInfoByStationId - ==> Preparing: select id,name,photo,parent_id, 0 recovery_price from nx_product as f where exists( select e.parent_id from nx_enterprise_recycle_station as a left join nx_price_recycle as b on a.id=b.recycle_id left join nx_price_product as c on b.price_id= c.price_id left join nx_price as d on d.id=b.price_id left join nx_product as e on e.id=c.product_id where a.id=? and e.parent_id=f.id ) union all select e.id,e.name,e.photo,e.parent_id, c.recovery_price from nx_enterprise_recycle_station as a left join nx_price_recycle as b on a.id=b.recycle_id left join nx_price_product as c on b.price_id= c.price_id left join nx_price as d on d.id=b.price_id left join nx_product as e on e.id=c.product_id where a.id=? +2024-04-25 17:47:31.244 [http-nio-8808-exec-9] DEBUG c.y.m.R.getStationInfoByStationId - ==> Parameters: 552044082721986181(String), 552044082721986181(String) +2024-04-25 17:47:31.351 [http-nio-8808-exec-9] DEBUG c.y.m.R.getStationInfoByStationId - <== Total: 17 +2024-04-25 17:47:33.366 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Preparing: SELECT id,station_id,staffs_name,mobile_phone,head_icon,gender,recycle_miles,order_total,good_total,order_amount,auto_enabled,enabled_mark AS status,openid,company_id FROM nx_recycle_station_staff WHERE id=? +2024-04-25 17:47:33.367 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Parameters: 552131464246859397(String) +2024-04-25 17:47:33.385 [http-nio-8808-exec-9] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - <== Total: 1 diff --git a/log.path_IS_UNDEFINED/error/log-error-2024-04-24.0.log b/log.path_IS_UNDEFINED/error/log-error-2024-04-24.0.log new file mode 100644 index 0000000..e69de29 diff --git a/log.path_IS_UNDEFINED/info/log-info-2024-04-24.0.log b/log.path_IS_UNDEFINED/info/log-info-2024-04-24.0.log new file mode 100644 index 0000000..6dc77b2 --- /dev/null +++ b/log.path_IS_UNDEFINED/info/log-info-2024-04-24.0.log @@ -0,0 +1,2 @@ +2024-04-23 13:37:36.665 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated... +2024-04-23 13:37:36.716 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed. diff --git a/log.path_IS_UNDEFINED/log_debug.log b/log.path_IS_UNDEFINED/log_debug.log index e69de29..75b3740 100644 --- a/log.path_IS_UNDEFINED/log_debug.log +++ b/log.path_IS_UNDEFINED/log_debug.log @@ -0,0 +1,105 @@ +2024-04-25 17:51:14.251 [http-nio-8808-exec-7] DEBUG cc.yunxi.common.advice.CommonExceptionAdvice - +org.springframework.web.util.NestedServletException: Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1086) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:964) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) + at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:696) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:779) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at cc.yunxi.filter.HttpServletRequestReplacedFilter.doFilter(HttpServletRequestReplacedFilter.java:28) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:96) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:177) + at org.apache.catalina.core.StandardContextValve.__invoke(StandardContextValve.java:97) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:41002) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:891) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1784) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) + at java.lang.Thread.run(Thread.java:748) +Caused by: java.lang.BootstrapMethodError: call site initialization exception + at java.lang.invoke.CallSite.makeSite(CallSite.java:341) + at java.lang.invoke.MethodHandleNatives.linkCallSiteImpl(MethodHandleNatives.java:307) + at java.lang.invoke.MethodHandleNatives.linkCallSite(MethodHandleNatives.java:297) + at cc.yunxi.service.impl.RecycleOrderServiceImpl.queryOrderByPage(RecycleOrderServiceImpl.java:134) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$FastClassBySpringCGLIB$$1.invoke() + at sun.reflect.GeneratedMethodAccessor238.invoke(Unknown Source) + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.validation.beanvalidation.MethodValidationInterceptor.invoke(MethodValidationInterceptor.java:123) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController.queryOrderByPage(RecycleOrderController.java:85) + at cc.yunxi.controller.RecycleOrderController$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at sun.reflect.GeneratedMethodAccessor191.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1071) + ... 51 common frames omitted +Caused by: java.lang.ClassCastException: Cannot cast cc.yunxi.service.impl.RecycleOrderServiceImpl$$Lambda$1909/712686415 to cc.yunxi.common.domain.function.SFunction + at java.lang.Class.cast(Class.java:3369) + at com.zeroturnaround.jrebelbase.facade.ad.a(SourceFile:89) + at com.zeroturnaround.jrebelbase.facade.ad.cast(SourceFile:51) + at java.lang.invoke.MethodHandle.bindTo(MethodHandle.java:1276) + at java.lang.invoke.MethodHandles.constant(MethodHandles.java:2279) + at java.lang.invoke.InnerClassLambdaMetafactory.buildCallSite(InnerClassLambdaMetafactory.java:216) + at java.lang.invoke.LambdaMetafactory.altMetafactory(LambdaMetafactory.java:474) + at com.zeroturnaround.jrebelbase.facade.at.altMetafactory(SourceFile:56) + at java.lang.invoke.CallSite.makeSite(CallSite.java:314) + ... 85 common frames omitted +2024-04-25 17:51:18.855 [http-nio-8808-exec-1] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Preparing: SELECT id,station_id,staffs_name,mobile_phone,head_icon,gender,recycle_miles,order_total,good_total,order_amount,auto_enabled,enabled_mark AS status,openid,company_id FROM nx_recycle_station_staff WHERE id=? +2024-04-25 17:51:18.859 [http-nio-8808-exec-1] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - ==> Parameters: 552131464246859397(String) +2024-04-25 17:51:18.871 [http-nio-8808-exec-1] DEBUG cc.yunxi.mapper.RecyclerMapper.selectById - <== Total: 1 diff --git a/log.path_IS_UNDEFINED/log_error.log b/log.path_IS_UNDEFINED/log_error.log index e69de29..1828f3f 100644 --- a/log.path_IS_UNDEFINED/log_error.log +++ b/log.path_IS_UNDEFINED/log_error.log @@ -0,0 +1,199 @@ +2024-04-25 14:43:14.933 [http-nio-8808-exec-10] ERROR cc.yunxi.common.advice.CommonExceptionAdvice - 其他异常 uri : /api/recycle-order/page -> +java.lang.RuntimeException: get SerializedLambda exception. + at cc.yunxi.common.utils.LambdaUtil.getSerializedLambda(LambdaUtil.java:105) + at cc.yunxi.common.utils.LambdaUtil.findClass(LambdaUtil.java:69) + at java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1660) + at cc.yunxi.common.utils.LambdaUtil.getClazz(LambdaUtil.java:64) + at cc.yunxi.common.domain.PageQuery.addOrderItem(PageQuery.java:57) + at cc.yunxi.service.impl.RecycleOrderServiceImpl.queryOrderByPage(RecycleOrderServiceImpl.java:134) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.validation.beanvalidation.MethodValidationInterceptor.invoke(MethodValidationInterceptor.java:123) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at cc.yunxi.controller.RecycleOrderController.queryOrderByPage(RecycleOrderController.java:85) + at cc.yunxi.controller.RecycleOrderController$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1071) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:964) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) + at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:696) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:779) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at cc.yunxi.filter.HttpServletRequestReplacedFilter.doFilter(HttpServletRequestReplacedFilter.java:28) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:96) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:177) + at org.apache.catalina.core.StandardContextValve.__invoke(StandardContextValve.java:97) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:41002) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:891) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1784) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) + at java.lang.Thread.run(Thread.java:748) +Caused by: java.lang.IllegalArgumentException: object is not an instance of declaring class + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at cc.yunxi.common.utils.LambdaUtil.getSerializedLambda(LambdaUtil.java:102) + ... 88 common frames omitted +2024-04-25 14:43:22.505 [http-nio-8808-exec-3] ERROR cc.yunxi.common.advice.CommonExceptionAdvice - 其他异常 uri : /api/recycle-order/page -> +java.lang.RuntimeException: get SerializedLambda exception. + at cc.yunxi.common.utils.LambdaUtil.getSerializedLambda(LambdaUtil.java:105) + at cc.yunxi.common.utils.LambdaUtil.findClass(LambdaUtil.java:69) + at java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1660) + at cc.yunxi.common.utils.LambdaUtil.getClazz(LambdaUtil.java:64) + at cc.yunxi.common.domain.PageQuery.addOrderItem(PageQuery.java:57) + at cc.yunxi.service.impl.RecycleOrderServiceImpl.queryOrderByPage(RecycleOrderServiceImpl.java:134) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.validation.beanvalidation.MethodValidationInterceptor.invoke(MethodValidationInterceptor.java:123) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.service.impl.RecycleOrderServiceImpl$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at cc.yunxi.controller.RecycleOrderController.queryOrderByPage(RecycleOrderController.java:85) + at cc.yunxi.controller.RecycleOrderController$$FastClassBySpringCGLIB$$1.invoke() + at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:793) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) + at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:763) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:708) + at cc.yunxi.controller.RecycleOrderController$$EnhancerBySpringCGLIB$$1.queryOrderByPage() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1071) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:964) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) + at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:696) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:779) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at cc.yunxi.filter.HttpServletRequestReplacedFilter.doFilter(HttpServletRequestReplacedFilter.java:28) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:96) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:177) + at org.apache.catalina.core.StandardContextValve.__invoke(StandardContextValve.java:97) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:41002) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:891) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1784) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) + at java.lang.Thread.run(Thread.java:748) +Caused by: java.lang.IllegalArgumentException: object is not an instance of declaring class + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at cc.yunxi.common.utils.LambdaUtil.getSerializedLambda(LambdaUtil.java:102) + ... 88 common frames omitted +2024-04-25 17:41:51.284 [http-nio-8808-exec-5] ERROR cc.yunxi.common.advice.CommonExceptionAdvice - 参数异常 -> NestedServletException，Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception +2024-04-25 17:47:27.905 [http-nio-8808-exec-3] ERROR cc.yunxi.common.advice.CommonExceptionAdvice - 参数异常 -> NestedServletException，Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception +2024-04-25 17:51:14.249 [http-nio-8808-exec-7] ERROR cc.yunxi.common.advice.CommonExceptionAdvice - 参数异常 -> NestedServletException，Handler dispatch failed; nested exception is java.lang.BootstrapMethodError: call site initialization exception diff --git a/log.path_IS_UNDEFINED/log_info.log b/log.path_IS_UNDEFINED/log_info.log index 6dc77b2..73e8394 100644 --- a/log.path_IS_UNDEFINED/log_info.log +++ b/log.path_IS_UNDEFINED/log_info.log @@ -1,2 +1,64 @@ -2024-04-23 13:37:36.665 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated... -2024-04-23 13:37:36.716 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed. +2024-04-25 14:43:11.702 [http-nio-8808-exec-10] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode. +2024-04-25 14:43:11.798 [http-nio-8808-exec-10] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 82 ms. Found 0 Redis repository interfaces. +2024-04-25 14:43:14.622 [http-nio-8808-exec-10] INFO s.d.s.w.WebMvcPropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2ControllerWebMvc#getDocumentation(String, HttpServletRequest)] +2024-04-25 14:43:14.734 [http-nio-8808-exec-10] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-order/page】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"pageNo":1,"pageSize":10,"location":{"longitude":"121.226540","latitude":"31.032410"},"orderType":"SH_ORDER","status":"PENDING"}】 +2024-04-25 14:43:14.734 [http-nio-8808-exec-10] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NTQ0OTIzfQ.XIApmL8yaKRdGZPQFs4nATcllOnC5MkFah-Te6V5iRP-ccfO25-_l56Zie2CUiY9eIRf-7eEl60th3wZ3I27caDzcpeIq6rfjrGybN9p9CK1dIKeyWnUnh1is14hqD8I00z_9qnDhYymmYiI7yi4pFf8TnnM1gaJnsezpt0LTWwcXMKQq8S2CNBMM0VtfGgOa9uwdl48-ST6mRj8A7-pFZZWBQ7C8MDUSdQATCKmsjvrGGqq5Kqz5iMxZ-enQPpau3ViaZ3sp5t9P-YfMhlhSVR6EsbLxk1Yz7XQhOh1IP9HMG0ks_VnvdtOzVp-pO8THUxjWD8gvheI7QqVupDOCA +2024-04-25 14:43:14.770 [http-nio-8808-exec-10] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 14:43:14.949 [http-nio-8808-exec-10] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【217】ms +2024-04-25 14:43:22.374 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-order/page】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"pageNo":1,"pageSize":10,"location":{"longitude":"121.226540","latitude":"31.032410"},"orderType":"SH_ORDER","status":"PENDING"}】 +2024-04-25 14:43:22.379 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NTQ0OTIzfQ.XIApmL8yaKRdGZPQFs4nATcllOnC5MkFah-Te6V5iRP-ccfO25-_l56Zie2CUiY9eIRf-7eEl60th3wZ3I27caDzcpeIq6rfjrGybN9p9CK1dIKeyWnUnh1is14hqD8I00z_9qnDhYymmYiI7yi4pFf8TnnM1gaJnsezpt0LTWwcXMKQq8S2CNBMM0VtfGgOa9uwdl48-ST6mRj8A7-pFZZWBQ7C8MDUSdQATCKmsjvrGGqq5Kqz5iMxZ-enQPpau3ViaZ3sp5t9P-YfMhlhSVR6EsbLxk1Yz7XQhOh1IP9HMG0ks_VnvdtOzVp-pO8THUxjWD8gvheI7QqVupDOCA +2024-04-25 14:43:22.409 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 14:43:22.516 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【142】ms +2024-04-25 14:43:30.978 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated... +2024-04-25 14:43:30.998 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed. +2024-04-25 17:41:44.434 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/common/hsylogin】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"code":"0a3zJrGa1BlGlH0PafGa10mCUd3zJrGC","encryptedData":"GxMmTsfKhbwaK+5r0ZITQpKoQTxiQwDUtqZK+N3ktuEwvsXZXNgq629f9BX1dktxAVdzbv+LZB+lGsI3wUkJQL52gj52XOn5ObcdmWjvOG1ePk3rkRNxT5KurnEyoelKJ037yqtpQpjOH51kZM95V0ykPz99EMXObQzBXQo/xdn6uvSHtWlguLvRHqkBPuf4oeZdplz+P7CwnZC+xs4oLQ==","iv":"BCi3IU6hZx6n+4Afd4gOBQ==","userType":2}】 +2024-04-25 17:41:44.458 [http-nio-8808-exec-3] INFO cc.yunxi.service.impl.CommonService - login request body：WxLoginDTO(code=0a3zJrGa1BlGlH0PafGa10mCUd3zJrGC, encryptedData=GxMmTsfKhbwaK+5r0ZITQpKoQTxiQwDUtqZK+N3ktuEwvsXZXNgq629f9BX1dktxAVdzbv+LZB+lGsI3wUkJQL52gj52XOn5ObcdmWjvOG1ePk3rkRNxT5KurnEyoelKJ037yqtpQpjOH51kZM95V0ykPz99EMXObQzBXQo/xdn6uvSHtWlguLvRHqkBPuf4oeZdplz+P7CwnZC+xs4oLQ==, iv=BCi3IU6hZx6n+4Afd4gOBQ==, userType=2) +2024-04-25 17:41:44.635 [http-nio-8808-exec-3] INFO cc.yunxi.service.impl.CommonService - WXserver code2Session return {"session_key":"ycvVHwfdaDBpgJHg0YFS4A==","openid":"ogY2o6_Mpi8nzk2ZQOBYlkYaeeME"} +2024-04-25 17:41:45.221 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【789】ms +2024-04-25 17:41:45.290 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/enterprise/org-user】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【phone=13601921745】 +2024-04-25 17:41:45.298 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:41:45.317 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:41:45.318 [http-nio-8808-exec-9] INFO cc.yunxi.aspect.JudgeUserAspect - 请求控制器: CommonResult cc.yunxi.controller.EnterpriseController.isOrgUser(String), 当前用户信息: UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null) +2024-04-25 17:41:45.430 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【141】ms +2024-04-25 17:41:51.028 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-station/price-product】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【stationId=552044082721986181】 +2024-04-25 17:41:51.028 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:41:51.030 [http-nio-8808-exec-5] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-order/page】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"pageNo":1,"pageSize":10,"location":{"longitude":"121.226540","latitude":"31.032410"},"orderType":"SH_ORDER","status":"PENDING"}】 +2024-04-25 17:41:51.031 [http-nio-8808-exec-5] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:41:51.046 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:41:51.051 [http-nio-8808-exec-5] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:41:51.300 [http-nio-8808-exec-5] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【270】ms +2024-04-25 17:41:51.428 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【401】ms +2024-04-25 17:41:52.620 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycler/info】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【】 +2024-04-25 17:41:52.626 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:41:52.647 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:41:52.648 [http-nio-8808-exec-6] INFO cc.yunxi.aspect.JudgeUserAspect - 请求控制器: CommonResult cc.yunxi.controller.RecyclerController.getRecyclerInfo(), 当前用户信息: UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null) +2024-04-25 17:41:52.714 [http-nio-8808-exec-6] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【94】ms +2024-04-25 17:41:57.498 [http-nio-8808-exec-2] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycler/info】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【】 +2024-04-25 17:41:57.499 [http-nio-8808-exec-2] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:41:57.516 [http-nio-8808-exec-2] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:41:57.517 [http-nio-8808-exec-2] INFO cc.yunxi.aspect.JudgeUserAspect - 请求控制器: CommonResult cc.yunxi.controller.RecyclerController.getRecyclerInfo(), 当前用户信息: UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null) +2024-04-25 17:41:57.546 [http-nio-8808-exec-2] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【48】ms +2024-04-25 17:47:27.773 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-order/page】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"pageNo":1,"pageSize":10,"location":{"longitude":"121.226540","latitude":"31.032410"},"orderType":"SH_ORDER","status":"PENDING"}】 +2024-04-25 17:47:27.774 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:47:27.808 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:47:27.925 [http-nio-8808-exec-3] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【152】ms +2024-04-25 17:47:31.037 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-station/price-product】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【stationId=552044082721986181】 +2024-04-25 17:47:31.038 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:47:31.060 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:47:31.362 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【325】ms +2024-04-25 17:47:33.333 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycler/info】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【】 +2024-04-25 17:47:33.333 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:47:33.351 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:47:33.354 [http-nio-8808-exec-9] INFO cc.yunxi.aspect.JudgeUserAspect - 请求控制器: CommonResult cc.yunxi.controller.RecyclerController.getRecyclerInfo(), 当前用户信息: UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null) +2024-04-25 17:47:33.392 [http-nio-8808-exec-9] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【59】ms +2024-04-25 17:51:14.195 [http-nio-8808-exec-7] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycle-order/page】, 请求方法:【POST】, 协议:【application/json】, 请求数据: 【{"pageNo":1,"pageSize":10,"location":{"longitude":"121.226540","latitude":"31.032410"},"orderType":"SH_ORDER","status":"PENDING"}】 +2024-04-25 17:51:14.196 [http-nio-8808-exec-7] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:51:14.224 [http-nio-8808-exec-7] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:51:14.264 [http-nio-8808-exec-7] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【70】ms +2024-04-25 17:51:15.728 [http-nio-8808-exec-1] INFO cc.yunxi.interceptor.StatsInterceptor - 请求路径:【/api/recycler/info】, 请求方法:【GET】, 协议:【application/json】, 请求数据: 【】 +2024-04-25 17:51:15.729 [http-nio-8808-exec-1] INFO cc.yunxi.interceptor.LoginInterceptor - request token = eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjU1MjEzMTQ2NDI0Njg1OTM5NyIsInN0YXRpb25JZCI6IjU1MjA0NDA4MjcyMTk4NjE4MSIsInVzZXJuYW1lIjoi546L5paH5p2wIiwicGhvbmUiOiIxMzYwMTkyMTc0NSIsIm9wZW5pZCI6Im9nWTJvNl9NcGk4bnprMlpRT0JZbGtZYWVlTUUiLCJ0aW1lRXhwaXJlIjoyNTkyMDAwMDAwfSwiZXhwIjoxNzE2NjMwMTA0fQ.C9XgPihVgt2rGgmVvFhda5ZikeLTCNAGip2TUoENg8l_P_rWZM9MefGfN8RCXVOE-GHRBxcO4uUzDqqGUTiXkpPZD6fQJzw2rT6kTRHYrECzcemxyGMURbTPuyrS4hXrtx0-tKcroSv1IpP5NuhtESD-cegm2w0npapTZ-oNxm_pnx-pWvx3LUgTMVz-5h6ah7TwehtnBt0nhE3DQJ8yW1NVDOSbpb4hR0ZPTlzdKG5o4Zz62Zp8-jAmHpaCigwDTdzJ2lVRq9aXUd00Rlf4D1ShRxEVonAEmsaq2id5XZnX2a9-EkypUnoCzkOroACYtJXSssgkISNf_imO1Y7Paw +2024-04-25 17:51:15.748 [http-nio-8808-exec-1] INFO cc.yunxi.interceptor.LoginInterceptor - 当前用户信息: 【UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null)】 +2024-04-25 17:51:15.748 [http-nio-8808-exec-1] INFO cc.yunxi.aspect.JudgeUserAspect - 请求控制器: CommonResult cc.yunxi.controller.RecyclerController.getRecyclerInfo(), 当前用户信息: UserDTO(userType=RECYCLER, id=552131464246859397, stationId=552044082721986181, username=王文杰, phone=13601921745, openid=ogY2o6_Mpi8nzk2ZQOBYlkYaeeME, timeExpire=2592000000, token=null, isClientUnit=null) +2024-04-25 17:51:18.877 [http-nio-8808-exec-1] INFO cc.yunxi.interceptor.StatsInterceptor - 请求耗时:【3149】ms +2024-04-25 17:59:11.785 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated... +2024-04-25 17:59:11.807 [SpringApplicationShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed. diff --git a/log.path_IS_UNDEFINED/log_warn.log b/log.path_IS_UNDEFINED/log_warn.log index e69de29..115ae2a 100644 --- a/log.path_IS_UNDEFINED/log_warn.log +++ b/log.path_IS_UNDEFINED/log_warn.log @@ -0,0 +1,30 @@ +2024-04-25 17:41:44.739 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@159bccb9 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.743 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@3f125765 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.747 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@656352a9 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.750 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@2e56a4b8 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.753 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@66972e5d (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.758 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@4b93f495 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.762 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@341a0154 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.768 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@2f72000b (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.777 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@7048367e (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:41:44.838 [http-nio-8808-exec-3] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@242b53be (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.083 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@2980c107 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.094 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@680924f0 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.103 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@693d22fb (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.109 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@461a4e22 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.116 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@137cfb38 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.124 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@32737303 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.135 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@3259a54c (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.157 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@26a6967b (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.176 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@52f71cac (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:47:31.192 [http-nio-8808-exec-9] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@7bb5969a (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.760 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@1a228f22 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.779 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@1be15def (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.783 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@77a1c11e (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.796 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@79740b57 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.800 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@22af49c6 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.805 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@33b06659 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.811 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@4a60f800 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.817 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@13176ca8 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.820 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@4baef675 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. +2024-04-25 17:51:15.828 [http-nio-8808-exec-1] WARN com.zaxxer.hikari.pool.PoolBase - HikariPool-1 - Failed to validate connection com.mysql.cj.jdbc.ConnectionImpl@7b9cd3f7 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value. diff --git a/log.path_IS_UNDEFINED/warn/log-warn-2024-04-24.0.log b/log.path_IS_UNDEFINED/warn/log-warn-2024-04-24.0.log new file mode 100644 index 0000000..e69de29 diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java b/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java index 8b3003a..426d28f 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/EnterpriseController.java @@ -42,10 +42,10 @@ public class EnterpriseController { @ApiOperation("是否是商户用户，是则返回y，否则返回n") - @PostMapping("/is-org-user") - public CommonResult isOrgUser(@RequestParam("phone") String phone) { + @GetMapping("/org-user") + public CommonResult isOrgUser(@RequestParam("phone") String phone) { - String result = enterpriseWalletService.isOrgUser(phone); + Boolean result = enterpriseWalletService.isOrgUser(phone); return CommonResult.success(result); } diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java index 1297ce2..baac555 100644 --- a/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java @@ -4,6 +4,7 @@ import cc.yunxi.domain.po.Enterprise; import cc.yunxi.domain.po.EnterpriseWallet; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -15,7 +16,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WalletMapper extends BaseMapper { - - String queryOrgUserByPhone(String Phone); - + String queryOrgUserByPhone(@Param("phone") String phone); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java index e5bcdcb..892238d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseWalletService.java @@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IEnterpriseWalletService extends IService { - String isOrgUser(String phone); + Boolean isOrgUser(String phone); String addWallet(WalletVO walletVO); diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java index 76d57f1..3810d85 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java @@ -48,15 +48,15 @@ public class EnterpriseWalletServiceImpl extends ServiceImpl - + - + SELECT f_id FROM base_user where f_mobile_phone=#{phone} LIMIT 1; From 7b393e2523307f42e57fef5cef801d1f2286b92a Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Fri, 26 Apr 2024 18:54:04 +0800 Subject: [PATCH 12/13] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/client/ClientUpdateVO.java | 2 +- .../vo/priceproduct/ProductSimpleVO.java | 3 +++ .../mapper/RecycleStationPriceMapper.xml | 22 +++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java index 7f00d67..fe7fdc9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java @@ -39,7 +39,7 @@ public class ClientUpdateVO { private Integer gender; @ApiModelProperty(value = "生日", required = false, example = "2024-02-28 00:00:00") - @Past(message = "生日范围不正确，生日必须是今天以前的") +// @Past(message = "生日范围不正确，生日必须是今天以前的") private LocalDateTime birthday; @ApiModelProperty(value = "发票抬头", required = false, example = "中铁建工集团有限公司") diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java index c78e3eb..0a89910 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java @@ -22,6 +22,9 @@ import java.math.BigDecimal; @Accessors(chain = true) public class ProductSimpleVO { + @ApiModelProperty("废品id") + private String id; + @ApiModelProperty("废品编码") private String code; diff --git a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml index 060277b..7a09754 100644 --- a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml +++ b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml @@ -23,23 +23,23 @@ + + diff --git a/nxhs-service/src/main/resources/mapper/RecyclerMapper.xml b/nxhs-service/src/main/resources/mapper/RecyclerMapper.xml index 807c4a4..d9c2e7b 100644 --- a/nxhs-service/src/main/resources/mapper/RecyclerMapper.xml +++ b/nxhs-service/src/main/resources/mapper/RecyclerMapper.xml @@ -1,5 +1,7 @@ - - + +