admin
2024-06-30 b6fdf185c7e8fb1f06da0e609e39aecaef6b66f5
src/main/java/com/taoke/autopay/controller/client/OrderController.java
@@ -55,8 +55,9 @@
                // 判断是否是同一天
                desc = TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss");
                out.value(desc);
            } else
            } else {
                out.value("");
            }
        }
        @Override
@@ -156,6 +157,7 @@
    }
    /**
     * @return java.lang.String 返回是否可以去支付
     * @author hxh 
     * @description 设置订单号
     * @date 23:08 2024/6/24
@@ -163,7 +165,6 @@
     * @param: id 订单ID
     * @param: orderNo 订单号
     * @param: orderStatus 订单状态:订单已取消/已支付
     * @return java.lang.String 返回是否可以去支付
     **/
    @ResponseBody
    @RequestMapping("setOrderNo")
@@ -235,6 +236,7 @@
            orderUpdate.setOrderType(1);
            orderUpdate.setOrderState(dto.getOrder_status());
            orderUpdate.setOrderNo(orderNo);
            orderUpdate.setExcutePayTime(new Date());
            keyOrderService.update(orderUpdate);
            order = keyOrderService.selectById(id);
            return JsonUtil.loadTrueResult(gson.toJson(OrderFactory.create(order)));
@@ -245,6 +247,9 @@
            orderUpdate.setOrderState(0);
            orderUpdate.setOrderNo(orderNo);
            orderUpdate.setState(KeyOrder.STATE_REJECT_PAY);
            if (order.getExcutePayTime() == null) {
                orderUpdate.setExcutePayTime(new Date());
            }
            orderUpdate.setStateDesc(e.getMessage());
            keyOrderService.update(orderUpdate);
            return JsonUtil.loadFalseResult(e.getMessage());
@@ -281,6 +286,9 @@
                KeyOrder orderUpdate = new KeyOrder();
                orderUpdate.setId(id);
                orderUpdate.setState(KeyOrder.STATE_PAY);
                if (order.getPayTime() == null) {
                    orderUpdate.setPayTime(new Date());
                }
                orderUpdate.setStateDesc("支付成功");
                try {
                    keyOrderService.paySuccess(id,"支付成功",TimeUtil.getGernalTime(System.currentTimeMillis(),"yyyyMMdd"));