From 1f649d3a2a7b631b71d16bcc046c3c6c32c2ecbf Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期二, 29 十一月 2022 14:51:49 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java | 2 +- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java | 2 ++ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml | 5 ++++- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java | 3 +++ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 18 ++++++++++++++++++ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml | 3 +++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java index f0e8a4d..72d7851 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java @@ -129,4 +129,7 @@ @ApiModelProperty(value = "送达时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date serviceTime; + + @ApiModelProperty(value = "是否可退款按钮显示 1.可退款 2.不可退款") + private Integer refundable = 1; } diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java index d6b5c68..59e68b2 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java @@ -35,4 +35,6 @@ List<ComShopOrderCountVO> selectCountGroupStatus(@Param("storeId") Long storeId); int updateCancel(@Param("id") Long id, @Param("status") Integer status); + + int selectCountRefundNowByOrderId(@Param("orderId") Long orderId); } \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java index 6e45017..ddfe27f 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java @@ -54,7 +54,7 @@ private String refundOrderNo; /** - * 订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中) + * 订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中) */ @TableField(value = "status") private Integer status; diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java index e66fb06..2e181ea 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java @@ -387,6 +387,24 @@ orderVo.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO); } } + + //判断是否可以退款 订单是否已超过15天 是否已有退款订单 + int count = comShopFlowerRefundOrderDAO.selectCountRefundNowByOrderId(orderVo.getOrderId()); + if (count > 0){ + orderVo.setRefundable(2); + }else { + if (null == orderVo.getReceivingTime()){ + orderVo.setRefundable(2); + }else { + //收货时间往前推15天和当前时间做比较 + Date date = DateUtils.addDay(orderVo.getReceivingTime(), 15); + if(date.before(new Date())){ + orderVo.setRefundable(2); + } + } + } + + }); } return R.ok(orderPageVOIPage); diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml index f68dbd3..050baf8 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml @@ -44,7 +44,7 @@ <select id="pageOrderList" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO"> select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as - orderTotal,pay_amount,delivery_type,remark,create_at, logistics_company, logistics_no from com_shop_flower_order as cso + orderTotal,pay_amount,delivery_type,remark,create_at, logistics_company, logistics_no,receiving_time from com_shop_flower_order as cso where cso.delete_status = 1 <if test="comOrderListDTO.userId != null"> and cso.user_id = #{comOrderListDTO.userId} @@ -176,6 +176,9 @@ <if test="comOrderListDTO.deliveryId != null"> and o.delivery_id = #{comOrderListDTO.deliveryId} </if> + <if test="comOrderListDTO.status != null"> + and o.status = #{comOrderListDTO.status} + </if> order by o.create_at desc </select> diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml index 20dca49..cfb5403 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml @@ -63,4 +63,7 @@ <update id="updateCancel"> update com_shop_flower_refund_order set `status` = #{status},cancel_time = NOW() where id = #{id} </update> + <select id="selectCountRefundNowByOrderId" resultType="int"> + SELECT count(1) FROM com_shop_flower_refund_order WHERE order_id = #{orderId} and `status` in (9,10,13) and delete_status = 1 + </select> </mapper> \ No newline at end of file -- Gitblit v1.7.1