Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

Pu Zhibing

2 天以前 6011b014ae65b7a1bea456c02af4e2cd3596d8a1

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -58,6 +58,7 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
import com.ruoyi.order.util.PreviousSixMonths;
import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import com.ruoyi.order.vo.StatisticsOfBatteryVO;
import com.ruoyi.order.vo.WatchChargingOrderVo;
@@ -150,7 +151,7 @@
    @Resource
    private TOrderInvoiceService invoiceService;
    @Resource
    private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
    private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
    @Resource
    private PartnerClient partnerClient;
    @Resource
@@ -853,7 +854,17 @@
                                         @RequestParam("attach") String attach) {
        chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
    }
    
    /**
     * 支付宝H5支付成功后的回调
     */
    @ResponseBody
    @PostMapping(value = "/chargingOrderALIH5Callback")
    public void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no,
                                         @RequestParam("transaction_id") String transaction_id,
                                         @RequestParam("attach") String attach) {
        chargingOrderService.chargingOrderCallback(3, out_trade_no, transaction_id, attach);
    }

    
    /**
     *
@@ -1245,7 +1256,7 @@
    @GetMapping(value = "/watch/deletes")
    @ApiOperation(value = "监控订单-删除", tags = {"管理后台-订单管理"})
    public R watchChargingOrder(@RequestParam String id) {
        uploadRealTimeMonitoringDataClient.delete(id);
        uploadRealTimeMonitoringDataService.delete(id);
        return R.ok();
    }
    
@@ -2397,4 +2408,19 @@
        return R.ok(String.valueOf(chargingOrder.getId()));
    }

//    @GetMapping(value = "/getOrderByCode")
//    @ApiOperation(value = "H5通过编号查询订单", tags = {"H5-首页-用户充电订单信息"})
//    public R<String> getOrderByCode(@RequestParam("code") String code) {
//        Long userId = tokenService.getLoginUserApplet().getUserId();
//        TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
//                .eq(TChargingOrder::getAppUserId, userId)
//                .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4))
//                .orderByDesc(TChargingOrder::getCreateTime)
//                .last("LIMIT 1"));
//        if(Objects.isNull(chargingOrder)){
//            return R.ok();
//        }
//        return R.ok(String.valueOf(chargingOrder.getId()));
//    }

}