springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
@@ -154,4 +154,13 @@ */ @ApiModelProperty("商品规格名称") private String goodsAttrName; @ApiModelProperty(value = "店铺名称") private String storeName; @ApiModelProperty(value = "订单金额") private BigDecimal totalAmount; @ApiModelProperty(value = "自提点名称") private String pointName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
@@ -94,7 +94,10 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("自提点地址") private String address; @ApiModelProperty("自提点名称") private String pointName; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
@@ -79,6 +79,8 @@ private WxMaConfiguration wxMaConfiguration; @Resource private UserService userService; @Resource private ConvenientElevatingPointDAO convenientElevatingPointDAO; @Override @@ -113,6 +115,10 @@ IPage<ComShopFlowerRefundOrderVO> pages = this.baseMapper.pageRefundOrder(page, pageComOrderRefundDTO); for (ComShopFlowerRefundOrderVO comShopFlowerRefundOrderVO : pages.getRecords()) { String orderNo = comShopFlowerRefundOrderVO.getOrderNo(); ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderVO.getId()); comShopFlowerRefundOrderVO.setTotalAmount(comShopFlowerOrderDO.getTotalAmount()); ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDO.getPointId()); comShopFlowerRefundOrderVO.setPointName(convenientElevatingPointDO.getName()); List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>(); // 查询订单下商品信息 List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO @@ -141,6 +147,8 @@ BeanUtils.copyProperties(shopStoreDO, shopStoreVO); } comShopFlowerRefundOrderVO.setConvenientMerchantVO(shopStoreVO); comShopFlowerRefundOrderVO.setStoreName(shopStoreVO.getName()); } return R.ok(pages); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
@@ -75,7 +75,7 @@ sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company, sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName, ss.name as store_name ,ccep.address as goodsName, ss.name as store_name ,ccep.address,ccep.`name` point_name FROM com_shop_flower_order sr LEFT JOIN com_shop_flower_order_goods og ON sr.id = og.order_id LEFT JOIN com_shop_flower_goods_attr ga ON og.goods_attr_id = ga.id LEFT JOIN sys_user su ON sr.user_id = su.user_id
