#feat 添加退款申请按钮显示标识，

yanghui

2022-11-29 8439f785cbded2fd0b635cb728ce14b7e8a0ae56

#feat 添加退款申请按钮显示标识，

 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;
}

 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);
}

 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;

 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);

 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>

 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>