add 新增 查询充电优免订单接口

jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java

@@ -13,10 +13,12 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.ChargeAlgorithmRecord;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.service.CarCouponRecordService;
 import com.jsowell.pile.service.ChargeAlgorithmRecordService;
 import com.jsowell.pile.vo.base.StationInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.ChargeAlgorithmRecordVO;
 import com.jsowell.pile.vo.uniapp.customer.OrderVO;
+import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO;
 import com.jsowell.pile.vo.uniapp.customer.UniAppOrderVO;
 import com.jsowell.service.OrderService;
 import com.jsowell.wxpay.dto.WechatSendMsgDTO;
@@ -46,6 +48,9 @@ public class OrderController extends BaseController {
 	@Autowired
 	private ChargeAlgorithmRecordService chargeAlgorithmRecordService;
 
+	@Autowired
+	private CarCouponRecordService carCouponRecordService;
+
 	/**
 	 * 生成订单/创建订单
 	 * http://localhost:8080/uniapp/order/generateOrder
@@ -412,4 +417,26 @@ public class OrderController extends BaseController {
 		logger.info("查询电池充电报告 params:{}, result:{}", orderCode, response);
 		return response;
 	}
+
+	/**
+	 * 查询停车优免订单
+	 * @param request
+	 * @return
+	 */
+	@GetMapping("/queryParkingOrderList")
+	public RestApiResponse<?> queryParkingOrderList(HttpServletRequest request) {
+		RestApiResponse<?> response = null;
+		String memberId = null;
+		try {
+			memberId = getMemberIdByAuthorization(request);
+			List<ParkingOrderVO> list = carCouponRecordService.queryParkingOrderList(memberId);
+			response = new RestApiResponse<>(ImmutableMap.of("ParkingOrderVOList", list));
+		} catch (Exception e) {
+			logger.error("查询停车优免订单 error", e);
+			response = new RestApiResponse<>(e);
+		}
+
+		logger.info("查询停车优免订单 memberId:{}, result:{}", memberId, response);
+		return response;
+	}
 }

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -95,9 +95,6 @@ public class OrderService {
     @Autowired
     private OrderPayRecordService orderPayRecordService;
 
-    @Autowired
-    private WechatPayService wechatPayService;
-
     @Autowired
     private MemberTransactionRecordService memberTransactionRecordService;
 
@@ -134,15 +131,9 @@ public class OrderService {
     @Resource
     private PileMerchantInfoService pileMerchantInfoService;
 
-    @Resource
-    private MemberWalletLogService memberWalletLogService;
-
     @Resource
     private ClearingBillInfoService clearingBillInfoService;
 
-    @Autowired
-    private ThirdPartyStationRelationService thirdPartyStationRelationService;
-
     @Autowired
     private IThirdpartySnRelationService snRelationService;