部分退款调整

fmTakeaway/controls/flowControl.cpp

@@ -250,7 +250,9 @@ void FlowControl::_onProcessOrderHandle(const QString& orderId, const QString &o
                             orderObj->status = 200;         //只是为了更新显示 实际服务端返回"status": 0,
                         emit updateOrderDisplay(orderObj);
                         //处理部分退款
-                        if(orderObj->refund_status == 22 && recvObj["refund_status"].toInt() == 100)    //同意部分退款
+                        if(orderObj->refund_status == 22 &&
+                                (recvObj["refund_status"].toInt() == 100 ||
+                                 recvObj["refund_status"].toInt() == 30))    //同意部分退款
                         {
                             partialRefund(order_id);
                         }
@@ -288,7 +290,19 @@ void FlowControl::_onGetCode()
                 QLOG_ERROR() << "connect takeaway component failed!";
                 return;
             }
-            socket->write(QJsonDocument(recvObj).toJson(QJsonDocument::Compact));
+            QByteArray byteArray = QJsonDocument(recvObj).toJson(QJsonDocument::Compact);
+            int byteSize = byteArray.size();
+            int send = 0;
+            while(true)
+            {
+                int temp = 0;
+                temp = socket->write(byteArray.data() + send);
+                if(temp == -1)          //or -1 if an error occurred
+                    break;
+                send += temp;
+                if(send == byteSize)
+                    break;
+            }
             if(! socket->waitForBytesWritten(LOCAL_SOCKET_TIMEOUT))
             {
                 QLOG_ERROR() << "write to takeaway component failed!";

fmTakeaway/mainwindow.cpp

@@ -211,16 +211,34 @@ void MainWindow::_GetOrderAdditional(OrderObject *orderObj, QTableWidget *&table
                 table = ui->main_tableDCL;
                 break;
             case 2:
+            if(orderObj->refund_status == 22)
+            {
+                statusDesc = "申请部分退款";
+                operation = OPERATION_AGREE_REFUND;
+                table = ui->main_tableDCL;
+            }
+            else
+            {
                 statusDesc = "待配送";
                 operation = OPERATION_SENDOUT;
                 table = ui->main_tableYCL;
-                break;
+            }
+            break;
             case 4:
             case 5:
+            if(orderObj->refund_status == 22)
+            {
+                statusDesc = "申请部分退款";
+                operation = OPERATION_AGREE_REFUND;
+                table = ui->main_tableDCL;
+            }
+            else
+            {
                 statusDesc = "配送中";
                 operation = OPERATION_COMPLETE;
                 table = ui->main_tableYCL;
-                break;
+            }
+            break;
             case 6:
             if(orderObj->refund_status == 22)
             {
@@ -245,9 +263,9 @@ void MainWindow::_GetOrderAdditional(OrderObject *orderObj, QTableWidget *&table
                 statusDesc = "已取消";
                 table = ui->main_tableYQX;
             }
-                break;
+            break;
         }
-        //部分退款 status 可能为3、6
+        //部分退款 status 可能为3、6 | 还有可能是4、2
     }
 
     return;