Merge branch 'dev/v2.4.31_rjj' of jianyu/qmx_admin into feature/v2.4.31

src/order/optimizeOrder.go

@@ -106,11 +106,17 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		} else if param.PayMoney-param.Commission-param.ProceduresMoney > return_money-refund_money && return_money-refund_money > 0 {
 			updateData["return_status"] = 2
 		}
-		if return_money <= refund_money && return_money > 0 {
+		if return_money == refund_money && return_money > 0 {
 			updateData["refund_status"] = 1
 		} else if return_money > refund_money && refund_money > 0 {
 			updateData["refund_status"] = 2
 		}
+		if refund_money >= param.PayMoney {
+			updateData["refund_status"] = 1
+		}
+		if return_money >= param.PayMoney {
+			updateData["return_status"] = 1
+		}
 		//处理销售业绩
 		saleMoney := map[string]interface{}{}
 		if err := json.Unmarshal([]byte(qutil.ObjToString((*orderData)["saleMoney"])), &saleMoney); err != nil {