Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

@@ -119,9 +119,7 @@ func (OrderPaymentService *OrderPaymentService) ListOrderPayment(listOrderPaymen
 		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 	}
 	}
 	defer func() {
 	defer func() {
-		if err != nil {
-			transactionContext.RollbackTransaction()
-		}
+		transactionContext.RollbackTransaction()
 	}()
 	}()
 	var OrderPaymentRepository domain.OrderPaymentRepository
 	var OrderPaymentRepository domain.OrderPaymentRepository
 	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
 	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
@@ -162,9 +160,7 @@ func (OrderPaymentService *OrderPaymentService) ListDividendOrders(listOrderPaym
 		return 0, nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 		return 0, nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 	}
 	}
 	defer func() {
 	defer func() {
-		if err != nil {
-			transactionContext.RollbackTransaction()
-		}
+		transactionContext.RollbackTransaction()
 	}()
 	}()
 	if count, orders, err = OrderDao.GetDividendOrders(map[string]interface{}{
 	if count, orders, err = OrderDao.GetDividendOrders(map[string]interface{}{
 		"orderCode": listOrderPaymentQuery.SearchText,
 		"orderCode": listOrderPaymentQuery.SearchText,