功能完善

admin

2024-06-24 5d3b3b74afd2ac4cf21697fc38367b2f88170e9f

 src/main/java/com/taoke/autopay/controller/client/OrderController.java

@@ -18,6 +18,7 @@
import com.taoke.autopay.utils.JsonUtil;
import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.utils.TimeUtil;
import com.taoke.autopay.utils.order.DYOrderApi;
import com.taoke.autopay.vo.AcceptData;
import com.taoke.autopay.vo.KeyOrderVO;
import com.taoke.autopay.vo.OrderFilter;
@@ -91,7 +92,7 @@
                    query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_NOT_PROCESS});
                    break;
                case OrderFilter.STATE_PROCESSED:
                    query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_PAY});
                    query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_PAY, KeyOrder.STATE_REJECT_PAY});
                    break;
                case OrderFilter.STATE_PROCESS_ERROR:
                    query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_NOT_PAY});
@@ -145,10 +146,20 @@
        return JsonUtil.loadTrueResult(data);
    }

    /**
     * @author hxh 
     * @description 设置订单号
     * @date 23:08 2024/6/24
     * @param: acceptData
     * @param: id 订单ID
     * @param: orderNo 订单号
     * @param: orderStatus 订单状态：订单已取消/已支付
     * @return java.lang.String
     **/
    @ResponseBody
    @RequestMapping("setOrderNo")
    public String setOrderNo(AcceptData acceptData, String id,String orderNo){
        loggerPay.info("setOrderNo: {}-{}",id,orderNo);
    public String setOrderNo(AcceptData acceptData, String id, String orderNo, String orderStatus) {
        loggerPay.info("setOrderNo: {}-{}-{}", id, orderNo, orderStatus);
        if(StringUtil.isNullOrEmpty(id)){
            return JsonUtil.loadFalseResult("请上传id");
        }
@@ -170,17 +181,23 @@
        }

        try {
            DYOrderDto dto = new DYOrderDto(); // DYOrderApi.getOrderDetail(orderNo);
            dto.setOrder_status(1);
            DYOrderDto dto = DYOrderApi.getOrderDetail(orderNo);
//            dto.setOrder_status(1);
            if(dto.getOrder_status() !=DYOrderDto.ORDER_STATUS_NOT_PAY){
                // 订单不处于尚未付款状态
                KeyOrder orderUpdate=new KeyOrder();
                orderUpdate.setId(id);
                orderUpdate.setOrderState(dto.getOrder_status());
                orderUpdate.setOrderType(1);
                orderUpdate.setOrderNo(orderNo);
                if(order.getState() == KeyOrder.STATE_NOT_PROCESS){
                    orderUpdate.setState(KeyOrder.STATE_NOT_PAY);
                    orderUpdate.setStateDesc("订单不处于待付款状态");
                     if (dto.getOrder_status() == DYOrderDto.ORDER_STATUS_CANCELED) {
                        orderUpdate.setState(KeyOrder.STATE_PAY);
                        orderUpdate.setStateDesc(dto.getOrder_status_desc());
                    } else {
                        orderUpdate.setState(KeyOrder.STATE_PAY);
                        orderUpdate.setStateDesc(dto.getOrder_status_desc());
                    }
                }
                keyOrderService.update(orderUpdate);
                if(dto.getOrder_status() ==DYOrderDto.ORDER_STATUS_CANCELED){
@@ -198,6 +215,16 @@
            keyOrderService.update(orderUpdate);
            order = keyOrderService.selectById(id);
            return JsonUtil.loadTrueResult(gson.toJson(OrderFactory.create(order)));
        } catch (KeyOrderException e) {
            KeyOrder orderUpdate = new KeyOrder();
            orderUpdate.setId(id);
            orderUpdate.setOrderType(1);
            orderUpdate.setOrderState(0);
            orderUpdate.setOrderNo(orderNo);
            orderUpdate.setState(KeyOrder.STATE_REJECT_PAY);
            orderUpdate.setStateDesc(e.getMessage());
            keyOrderService.update(orderUpdate);
            return JsonUtil.loadFalseResult(e.getMessage());
        } catch (Exception e) {
            e.printStackTrace();
            return JsonUtil.loadFalseResult(e.getMessage());
@@ -219,6 +246,7 @@
            return JsonUtil.loadFalseResult("没有匹配到订单号");
        }

        if(order.getState()==KeyOrder.STATE_NOT_PROCESS) {
        if(!paySuccess){
          // 支付失败
            KeyOrder orderUpdate=new KeyOrder();
@@ -233,14 +261,53 @@
            orderUpdate.setStateDesc("支付成功");
            keyOrderService.update(orderUpdate);
        }
        }
        return JsonUtil.loadTrueResult("");
    }


    @ResponseBody
    @RequestMapping("rejectPay")
    public String rejectPay(AcceptData acceptData, Long uid, String id) {
        loggerPay.info("rejectPay: {}-{}", uid, id);
        if (StringUtil.isNullOrEmpty(id)) {
            return JsonUtil.loadFalseResult("请上传id");
        }
        KeyOrder order = keyOrderService.selectById(id);
        if (order == null) {
            return JsonUtil.loadFalseResult("口令不存在");
        }

        if (order.getState() != KeyOrder.STATE_NOT_PROCESS) {
            return JsonUtil.loadFalseResult("只能驳回未执行状态的口令");
        }

        KeyOrder orderUpdate = new KeyOrder();
        orderUpdate.setId(id);
        orderUpdate.setState(KeyOrder.STATE_REJECT_PAY);
        orderUpdate.setStateDesc("人工驳回");
        keyOrderService.update(orderUpdate);

        return JsonUtil.loadTrueResult("");
    }


    @ResponseBody
    @RequestMapping("deleteAll")
    public String deleteAll(AcceptData acceptData){
    public String deleteAll(AcceptData acceptData,Long uid) {

     ClientInfo user=   clientInfoService.selectByPrimaryKey(uid);
     if(user==null){
         return JsonUtil.loadFalseResult("用户不存在");
     }

     if(user.getRule() != ClientInfo.RULE_ADMIN){
         return JsonUtil.loadFalseResult("只有管理员才能删除");
     }

        // 删除24小时之前的数据
//        keyOrderService.deleteAll(new Date(System.currentTimeMillis() - 24*60*60*1000L));
        keyOrderService.deleteAll(new Date(System.currentTimeMillis()));
        // 刪除所有數據
        return JsonUtil.loadTrueResult("");
    }