Browse Source

feat(接口):检查云端订单状态接口增加reaseToken及金额

Zhenghj 1 year ago
parent
commit
32e3a56471

+ 2 - 5
app/src/main/java/com/doverfuelingsolutions/issp/api/SystemApi.kt

@@ -130,11 +130,8 @@ object SystemApi {
      * 查找云端当前订单状态
      */
     suspend fun getOrderStateForClound(dc: DeviceClass) = suspendCoroutine<DFSResult<CheckResponse>> {
-        val checkRequest =
-            CheckRequest(dc.transactionSeqNo, dc.pumpNo.toString(), GlobalData.serialNumber.get())
-
-        DFSLog.i("查找云端订单状态:${dc.transactionSeqNo}-${dc.pumpNo.toString()}-${GlobalData.serialNumber.get()}")
-        serviceCheck.checkOrderState(dc.transactionSeqNo, dc.pumpNo.toString(), GlobalData.serialNumber.get()).enqueue(object :Callback<CheckResponse>{
+        DFSLog.i("查找云端订单状态:${dc.releaseTokenAttribute}-${dc.myAmount}-${dc.transactionSeqNo}-${dc.pumpNo.toString()}-${GlobalData.serialNumber.get()}")
+        serviceCheck.checkOrderState(dc.releaseTokenAttribute,dc.myAmount,dc.transactionSeqNo, dc.pumpNo.toString(), GlobalData.serialNumber.get()).enqueue(object :Callback<CheckResponse>{
             override fun onResponse(call: Call<CheckResponse>, response: Response<CheckResponse>) {
                 val code = response.code()
                 val body = response.body()

+ 2 - 0
app/src/main/java/com/doverfuelingsolutions/issp/api/service/ServiceCheck.kt

@@ -12,6 +12,8 @@ interface ServiceCheck {
 
     @POST(WayneApiConfig.CHECK_ORDER_STATE)
     fun checkOrderState(
+        @Query("FuelItemFdcReleaseTokenAttribute") fuelItemFdcReleaseTokenAttribute: String,
+        @Query("FuelItemOriginalGrossAmount") fuelItemOriginalGrossAmount:String,
         @Query("SeqNo") seqNo:String,
         @Query("NozzleId") nozzleId:String,
         @Query("sn") sn: String,