APP订单详情

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -9,6 +9,7 @@ import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.service.admin.StationService;
 import com.kym.service.enplus.EnNotifyService;
 import com.kym.service.enplus.EnPlusService;
+import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.ChargeService;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,9 @@ public class ChargerController {
     @Autowired
     private ChargeService chargeService;
 
+    @Autowired
+    private ChargeOrderService chargeOrderService;
+
     @Autowired
     private EnNotifyService enNotifyService;
 
@@ -86,6 +90,12 @@ public class ChargerController {
         return R.success(chargeService.queryEquipBusinessPolicy(connectorId));
     }
 
+    @ApiLog("充电订单详情")
+    @GetMapping("/orderDetail/{startChargeSeq}")
+    public R orderDetail(@PathVariable("startChargeSeq") String startChargeSeq) {
+        return R.success(chargeOrderService.orderDetailForApp(startChargeSeq));
+    }
+
     //====================================================以上是请求EN+接口==============================================================
 
     // 【我们请求en+时，数据都要加密验签；en+推送给我们的数据，需要验签解密，响应不需要加密。】

service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -22,4 +22,6 @@ public interface ChargeOrderService extends IService<ChargeOrder> {
     PageInfo<ChargeOrder> customChargeOrders(CustomChargeOrdersQueryParam params, Integer pageNum, Integer pageSize);
 
     Object orderDetail(String startChargeSeq);
+
+    ChargeOrder orderDetailForApp(String startChargeSeq);
 }

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -48,5 +48,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
         return null;
     }
 
+    @Override
+    public ChargeOrder orderDetailForApp(String startChargeSeq) {
+        // TODO: 2023-08-24 后面跟上面接口合并
+        return lambdaQuery().eq(ChargeOrder::getStartChargeSeq, startChargeSeq).one();
+    }
+
 
 }

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -52,8 +52,8 @@ public class ChargeServiceImpl implements ChargeService {
      * @return
      */
     @Override
-    public Map queryStartCharge(String connectorId) {
-        var userId = StpUtil.getSession().getLong("userId");
+    public Map<String, String> queryStartCharge(String connectorId) {
+        var userId = StpUtil.getLoginIdAsLong();
         var map = getConnectorIdAndStationId(connectorId);
         connectorId = map.get("connectorId");
         var stationId = map.get("stationId");